mirror of
https://github.com/j-hc/revanced-magisk-module.git
synced 2025-05-23 18:16:26 +02:00
update config_update
This commit is contained in:
parent
7924b42e5a
commit
3e3cf49005
38
utils.sh
38
utils.sh
@ -42,7 +42,6 @@ get_rv_prebuilts() {
|
|||||||
local cl_dir=${patches_src%/*}
|
local cl_dir=${patches_src%/*}
|
||||||
cl_dir=${TEMP_DIR}/${cl_dir,,}-rv
|
cl_dir=${TEMP_DIR}/${cl_dir,,}-rv
|
||||||
[ -d "$cl_dir" ] || mkdir "$cl_dir"
|
[ -d "$cl_dir" ] || mkdir "$cl_dir"
|
||||||
: >"${cl_dir}/changelog.md"
|
|
||||||
for src_ver in "$cli_src CLI $cli_ver" "$integrations_src Integrations $integrations_ver" "$patches_src Patches $patches_ver"; do
|
for src_ver in "$cli_src CLI $cli_ver" "$integrations_src Integrations $integrations_ver" "$patches_src Patches $patches_ver"; do
|
||||||
set -- $src_ver
|
set -- $src_ver
|
||||||
local src=$1 tag=$2 ver=${3-} ext
|
local src=$1 tag=$2 ver=${3-} ext
|
||||||
@ -57,7 +56,6 @@ get_rv_prebuilts() {
|
|||||||
|
|
||||||
local rv_rel="https://api.github.com/repos/${src}/releases" name_ver
|
local rv_rel="https://api.github.com/repos/${src}/releases" name_ver
|
||||||
if [ "$ver" = "dev" ]; then
|
if [ "$ver" = "dev" ]; then
|
||||||
rv_rel+="/tags/$(gh_req "$rv_rel" - | jq -r '.[0] | .tag_name')"
|
|
||||||
name_ver="*-dev*"
|
name_ver="*-dev*"
|
||||||
elif [ "$ver" = "latest" ]; then
|
elif [ "$ver" = "latest" ]; then
|
||||||
rv_rel+="/latest"
|
rv_rel+="/latest"
|
||||||
@ -76,6 +74,7 @@ get_rv_prebuilts() {
|
|||||||
if [ -z "$file" ]; then
|
if [ -z "$file" ]; then
|
||||||
local resp asset name
|
local resp asset name
|
||||||
resp=$(gh_req "$rv_rel" -) || return 1
|
resp=$(gh_req "$rv_rel" -) || return 1
|
||||||
|
if [ "$ver" = "dev" ]; then resp=$(jq -r '.[0]' <<<"$resp"); fi
|
||||||
tag_name=$(jq -r '.tag_name' <<<"$resp")
|
tag_name=$(jq -r '.tag_name' <<<"$resp")
|
||||||
asset=$(jq -e -r ".assets[] | select(.name | endswith(\"$ext\"))" <<<"$resp") || return 1
|
asset=$(jq -e -r ".assets[] | select(.name | endswith(\"$ext\"))" <<<"$resp") || return 1
|
||||||
url=$(jq -r .url <<<"$asset")
|
url=$(jq -r .url <<<"$asset")
|
||||||
@ -83,6 +82,7 @@ get_rv_prebuilts() {
|
|||||||
file="${dir}/${name}"
|
file="${dir}/${name}"
|
||||||
gh_dl "$file" "$url" >&2 || return 1
|
gh_dl "$file" "$url" >&2 || return 1
|
||||||
if [ "$tag" = "Integrations" ]; then integs_file=$file; fi
|
if [ "$tag" = "Integrations" ]; then integs_file=$file; fi
|
||||||
|
echo "$tag: $(cut -d/ -f1 <<<"$src")/${name} " >>"${cl_dir}/changelog.md"
|
||||||
else
|
else
|
||||||
name=$(basename "$file")
|
name=$(basename "$file")
|
||||||
tag_name=$(cut -d'-' -f3- <<<"$name")
|
tag_name=$(cut -d'-' -f3- <<<"$name")
|
||||||
@ -90,18 +90,18 @@ get_rv_prebuilts() {
|
|||||||
if [ "$tag_name" = "v" ]; then abort; fi
|
if [ "$tag_name" = "v" ]; then abort; fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$tag: $(cut -d/ -f1 <<<"$src")/${name} " >>"${cl_dir}/changelog.md"
|
|
||||||
echo -n "$file "
|
echo -n "$file "
|
||||||
if [ "$tag" = "Patches" ]; then
|
if [ "$tag" = "Patches" ]; then
|
||||||
name="patches-${tag_name}.json"
|
name="patches-${tag_name}.json"
|
||||||
file="${dir}/${name}"
|
file="${dir}/${name}"
|
||||||
if [ ! -f "$file" ]; then
|
if [ ! -f "$file" ]; then
|
||||||
resp=$(gh_req "$rv_rel" -) || return 1
|
resp=$(gh_req "$rv_rel" -) || return 1
|
||||||
|
if [ "$ver" = "dev" ]; then resp=$(jq -r '.[0]' <<<"$resp"); fi
|
||||||
url=$(jq -e -r '.assets[] | select(.name | endswith("json")) | .url' <<<"$resp") || return 1
|
url=$(jq -e -r '.assets[] | select(.name | endswith("json")) | .url' <<<"$resp") || return 1
|
||||||
gh_dl "$file" "$url" >&2 || return 1
|
gh_dl "$file" "$url" >&2 || return 1
|
||||||
|
echo -e "[Changelog](https://github.com/${src}/releases/tag/${tag_name})\n" >>"${cl_dir}/changelog.md"
|
||||||
fi
|
fi
|
||||||
echo -n "$file "
|
echo -n "$file "
|
||||||
echo -e "[Changelog](https://github.com/${src}/releases/tag/${tag_name})\n" >>"${cl_dir}/changelog.md"
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
echo
|
echo
|
||||||
@ -116,7 +116,7 @@ get_rv_prebuilts() {
|
|||||||
rm "${integs_file}" || return 1
|
rm "${integs_file}" || return 1
|
||||||
zip -0rq "${integs_file}" . || return 1
|
zip -0rq "${integs_file}" . || return 1
|
||||||
) >&2; then
|
) >&2; then
|
||||||
epr "Patching revanced-integrations failed"
|
echo >&2 "Patching revanced-integrations failed"
|
||||||
fi
|
fi
|
||||||
rm -r "${integs_file}-zip" || :
|
rm -r "${integs_file}-zip" || :
|
||||||
|
|
||||||
@ -155,26 +155,34 @@ config_update() {
|
|||||||
enabled=$(toml_get "$t" enabled) || enabled=true
|
enabled=$(toml_get "$t" enabled) || enabled=true
|
||||||
if [ "$enabled" = false ]; then continue; fi
|
if [ "$enabled" = false ]; then continue; fi
|
||||||
PATCHES_SRC=$(toml_get "$t" patches-source) || PATCHES_SRC=$DEF_PATCHES_SRC
|
PATCHES_SRC=$(toml_get "$t" patches-source) || PATCHES_SRC=$DEF_PATCHES_SRC
|
||||||
if [[ -v sources[$PATCHES_SRC] ]]; then
|
PATCHES_VER=$(toml_get "$t" patches-version) || PATCHES_VER=$DEF_PATCHES_VER
|
||||||
if [ "${sources[$PATCHES_SRC]}" = 1 ]; then
|
if [[ -v sources["$PATCHES_SRC/$PATCHES_VER"] ]]; then
|
||||||
|
if [ "${sources["$PATCHES_SRC/$PATCHES_VER"]}" = 1 ]; then
|
||||||
conf+="$t"
|
conf+="$t"
|
||||||
conf+=$'\n'
|
conf+=$'\n'
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
sources[$PATCHES_SRC]=0
|
sources["$PATCHES_SRC/$PATCHES_VER"]=0
|
||||||
if ! last_patches=$(gh_req "https://api.github.com/repos/${PATCHES_SRC}/releases/latest" - |
|
local rv_rel="https://api.github.com/repos/${PATCHES_SRC}/releases"
|
||||||
jq -e -r '.assets[] | select(.name | endswith("jar")) | .name'); then
|
if [ "$PATCHES_VER" = "dev" ]; then
|
||||||
|
last_patches=$(gh_req "$rv_rel" - | jq -e -r '.[0]')
|
||||||
|
elif [ "$PATCHES_VER" = "latest" ]; then
|
||||||
|
last_patches=$(gh_req "$rv_rel/latest" -)
|
||||||
|
else
|
||||||
|
last_patches=$(gh_req "$rv_rel/tags/${ver}" -)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! last_patches=$(jq -e -r '.assets[] | select(.name | endswith("jar")) | .name' <<<"$last_patches"); then
|
||||||
abort oops
|
abort oops
|
||||||
fi
|
fi
|
||||||
cur_patches=$(sed -n "s/.*Patches: ${PATCHES_SRC%%/*}\/\(.*\)/\1/p" build.md | xargs)
|
if [ "$last_patches" ]; then
|
||||||
if [ "$cur_patches" ] && [ "$last_patches" ]; then
|
if ! OP=$(grep "^Patches: ${PATCHES_SRC%%/*}/" build.md | grep "$last_patches"); then
|
||||||
if [ "${cur_patches}" != "$last_patches" ]; then
|
sources["$PATCHES_SRC/$PATCHES_VER"]=1
|
||||||
sources[$PATCHES_SRC]=1
|
|
||||||
prcfg=true
|
prcfg=true
|
||||||
conf+="$t"
|
conf+="$t"
|
||||||
conf+=$'\n'
|
conf+=$'\n'
|
||||||
else
|
else
|
||||||
echo "Patches: ${PATCHES_SRC%%/*}/${cur_patches} " >>"$TEMP_DIR"/skipped
|
echo "$OP" >>"$TEMP_DIR"/skipped
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user