Mirrors/revanced-magisk-module
1
0
Fork 0
mirror of https://github.com/j-hc/revanced-magisk-module.git synced 2025-05-02 07:34:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

update error handling

Browse Source
This commit is contained in:
j-hc 2024-10-05 21:21:17 +03:00
parent 45bf672667
commit f25b6c8da4
No known key found for this signature in database
GPG Key ID: CDF97F1DBFE904CD
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -50,7 +50,9 @@ java --version >/dev/null || abort "\`openjdk 17\` is not installed. install it
zip --version >/dev/null || abort "\`zip\` is not installed. install it with 'apt install zip' or equivalent" zip --version >/dev/null || abort "\`zip\` is not installed. install it with 'apt install zip' or equivalent"
# ---------------- # ----------------
rm -rf revanced-magisk/bin/*/tmp.* rm -rf revanced-magisk/bin/*/tmp.*
: >"$TEMP_DIR"/*-rv/changelog.md || : if [ "$(echo "$TEMP_DIR"/*-rv/changelog.md)" ]; then
: >"$TEMP_DIR"/*-rv/changelog.md || :
fi
get_prebuilts get_prebuilts

11
utils.sh
View File

@ -80,13 +80,14 @@ get_rv_prebuilts() {
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" echo "$tag: $(cut -d/ -f1 <<<"$src")/${name} " >>"${cl_dir}/changelog.md"
else else
local for_err=$file
if [ "$ver" = "latest" ]; then if [ "$ver" = "latest" ]; then
file=$(grep -v dev <<<"$file" | head -1) file=$(grep -v dev <<<"$file" | head -1)
else file=$(grep "${ver#v}" <<<"$file" | head -1); fi else file=$(grep "${ver#v}" <<<"$file" | head -1); fi
if [ -z "$file" ]; then abort "filter fail: '$for_err' with '$ver'"; fi
name=$(basename "$file") name=$(basename "$file")
tag_name=$(cut -d'-' -f3- <<<"$name") tag_name=$(cut -d'-' -f3- <<<"$name")
tag_name=v${tag_name%.*} tag_name=v${tag_name%.*}
if [ "$tag_name" = "v" ]; then abort "wrong ver"; fi
fi fi
echo -n "$file " echo -n "$file "
@ -543,9 +544,11 @@ build_rv() {
fi fi
fi fi
fi fi
if ! patch_apk "$stock_apk" "$patched_apk" "${patcher_args[*]}" "${args[cli]}" "${args[ptjar]}"; then if [ "${NORB:-}" != true ] || [ ! -f "$patched_apk" ]; then
epr "Building '${table}' failed!" if ! patch_apk "$stock_apk" "$patched_apk" "${patcher_args[*]}" "${args[cli]}" "${args[ptjar]}"; then
return 0 epr "Building '${table}' failed!"
return 0
fi
fi fi
if [ "$build_mode" = apk ]; then if [ "$build_mode" = apk ]; then
local apk_output="${BUILD_DIR}/${app_name_l}-${rv_brand_f}-v${version_f}-${arch_f}.apk" local apk_output="${BUILD_DIR}/${app_name_l}-${rv_brand_f}-v${version_f}-${arch_f}.apk"