From 37baf5ffdb069fd36de93dbc7d35a34e7afd6f9e Mon Sep 17 00:00:00 2001 From: j-hc Date: Sat, 8 Jun 2024 02:00:38 +0300 Subject: [PATCH] remove apkmonk --- CONFIG.md | 2 -- build.sh | 6 +----- utils.sh | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CONFIG.md b/CONFIG.md index 3256feb..678960a 100755 --- a/CONFIG.md +++ b/CONFIG.md @@ -5,7 +5,6 @@ Adding another revanced app is as easy as this: [Some-App] apkmirror-dlurl = "https://www.apkmirror.com/apk/inc/app" # or uptodown-dlurl = "https://app.en.uptodown.com/android" -# or apkmonk-dlurl = "https://www.apkmonk.com/app/com.app.app/" ``` ## More about other options: @@ -37,7 +36,6 @@ included-patches = "'Patch something'" # whitespace seperated list of patches to exclusive-patches = false # exclude all patches by default. default: false apkmirror-dlurl = "https://www.apkmirror.com/apk/inc/app" uptodown-dlurl = "https://spotify.en.uptodown.com/android" -apkmonk-dlurl = "https://www.apkmonk.com/app/com.app.app/" module-prop-name = "some-app-magisk" # magisk module prop name. apkmirror-dpi = "360-480dpi" # used to select apk variant from apkmirror. default: nodpi arch = "arm64-v8a" # 'arm64-v8a', 'arm-v7a', 'all', 'both'. 'both' downloads both arm64-v8a and arm-v7a. default: all diff --git a/build.sh b/build.sh index d670895..7f67488 100755 --- a/build.sh +++ b/build.sh @@ -127,10 +127,6 @@ for table_name in $(toml_get_table_names); do app_args[uptodown_dlurl]=${app_args[uptodown_dlurl]%/} app_args[dl_from]=uptodown } || app_args[uptodown_dlurl]="" - app_args[apkmonk_dlurl]=$(toml_get "$t" apkmonk-dlurl) && { - app_args[apkmonk_dlurl]=${app_args[apkmonk_dlurl]%/} - app_args[dl_from]=apkmonk - } || app_args[apkmonk_dlurl]="" app_args[apkmirror_dlurl]=$(toml_get "$t" apkmirror-dlurl) && { app_args[apkmirror_dlurl]=${app_args[apkmirror_dlurl]%/} app_args[dl_from]=apkmirror @@ -139,7 +135,7 @@ for table_name in $(toml_get_table_names); do app_args[archive_dlurl]=${app_args[archive_dlurl]%/} app_args[dl_from]=archive } || app_args[archive_dlurl]="" - if [ -z "${app_args[dl_from]-}" ]; then abort "ERROR: no 'apkmirror_dlurl', 'uptodown_dlurl' or 'apkmonk_dlurl' option was set for '$table_name'."; fi + if [ -z "${app_args[dl_from]-}" ]; then abort "ERROR: no 'apkmirror_dlurl', 'uptodown_dlurl' or 'archive_dlurl' option was set for '$table_name'."; fi app_args[arch]=$(toml_get "$t" arch) || app_args[arch]="all" if [ "${app_args[arch]}" != "both" ] && [ "${app_args[arch]}" != "all" ] && [[ ${app_args[arch]} != "arm64-v8a"* ]] && [[ ${app_args[arch]} != "arm-v7a"* ]]; then abort "wrong arch '${app_args[arch]}' for '$table_name'" diff --git a/utils.sh b/utils.sh index fc19e00..91a186e 100755 --- a/utils.sh +++ b/utils.sh @@ -341,7 +341,7 @@ build_rv() { p_patcher_args+=("$(join_args "${args[excluded_patches]}" -e) $(join_args "${args[included_patches]}" -i)") [ "${args[exclusive_patches]}" = true ] && p_patcher_args+=("--exclusive") - for dl_p in archive apkmirror uptodown apkmonk; do + for dl_p in archive apkmirror uptodown; do if [ -z "${args[${dl_p}_dlurl]}" ]; then continue; fi if ! get_"${dl_p}"_resp "${args[${dl_p}_dlurl]}" || ! pkg_name=$(get_"${dl_p}"_pkg_name); then args[${dl_p}_dlurl]="" @@ -382,7 +382,7 @@ build_rv() { version_f=${version_f#v} local stock_apk="${TEMP_DIR}/${pkg_name}-${version_f}-${arch_f}.apk" if [ ! -f "$stock_apk" ]; then - for dl_p in archive apkmirror uptodown apkmonk; do + for dl_p in archive apkmirror uptodown; do if [ -z "${args[${dl_p}_dlurl]}" ]; then continue; fi pr "Downloading '${table}' from ${dl_p}" if ! dl_${dl_p} "${args[${dl_p}_dlurl]}" "$version" "$stock_apk" "$arch" "${args[dpi]}" "$get_latest_ver"; then