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

dont abort when app to dl is not found

Browse Source
This commit is contained in:
j-hc 2023-02-14 17:42:26 +03:00
parent 3941f172b8
commit ded80b5ef2
No known key found for this signature in database
GPG Key ID: FCBF5E9C57092AD9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils.sh
View File

@ -36,6 +36,8 @@ toml_get() {
# --------------------------------------------------- # ---------------------------------------------------
pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; } pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; }
epr() { echo -e "\033[0;31m[-] ${1}\033[0m"; }
abort() { echo >&2 -e "\033[0;31mABORT: $1\033[0m" && exit 1; }
get_prebuilts() { get_prebuilts() {
pr "Getting prebuilts" pr "Getting prebuilts"
@ -91,8 +93,6 @@ get_prebuilts() {
fi fi
} }
abort() { echo >&2 -e "\033[0;31mABORT: $1\033[0m" && exit 1; }
set_prebuilts() { set_prebuilts() {
[ -d "$PREBUILTS_DIR" ] || abort "${PREBUILTS_DIR} directory could not be found" [ -d "$PREBUILTS_DIR" ] || abort "${PREBUILTS_DIR} directory could not be found"
RV_CLI_JAR=$(find "$PREBUILTS_DIR" -maxdepth 1 -name "revanced-cli-*.jar" | tail -n1) RV_CLI_JAR=$(find "$PREBUILTS_DIR" -maxdepth 1 -name "revanced-cli-*.jar" | tail -n1)
@ -307,12 +307,14 @@ build_rv() {
apkm_arch="armeabi-v7a" apkm_arch="armeabi-v7a"
fi fi
if ! dl_apkmirror "${args[apkmirror_dlurl]}" "$version" "$stock_apk" "$apkm_arch"; then if ! dl_apkmirror "${args[apkmirror_dlurl]}" "$version" "$stock_apk" "$apkm_arch"; then
abort "ERROR: Could not find any release of '${app_name}' with version '${version}' and arch '${apkm_arch}' from APKMirror" epr "ERROR: Could not find any release of '${app_name}' with version '${version}' and arch '${apkm_arch}' from APKMirror"
return 0
fi fi
elif [ "$dl_from" = uptodown ]; then elif [ "$dl_from" = uptodown ]; then
pr "Downloading '${app_name}' from Uptodown" pr "Downloading '${app_name}' from Uptodown"
if ! dl_uptodown "$uptwod_resp" "$version" "$stock_apk"; then if ! dl_uptodown "$uptwod_resp" "$version" "$stock_apk"; then
abort "ERROR: Could not download ${app_name} from Uptodown" epr "ERROR: Could not download ${app_name} from Uptodown"
return 0
fi fi
fi fi
fi fi