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

defer archive resp dl

Browse Source
This commit is contained in:
j-hc 2023-10-06 18:43:05 +03:00
parent a71cf6bac6
commit cddabd6285
No known key found for this signature in database
GPG Key ID: B69B8F690911EFCC
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
utils.sh
View File

@ -305,7 +305,7 @@ get_archive_resp() {
if [ -z "$r" ]; then return 1; else sed -n 's;^<a href="\(.*\)"[^"]*;\1;p' <<<"$r"; fi if [ -z "$r" ]; then return 1; else sed -n 's;^<a href="\(.*\)"[^"]*;\1;p' <<<"$r"; fi
} }
get_archive_vers() { sed 's/^[^-]*-//;s/-\(all\|arm64-v8a\|arm-v7a\)\.apk//g' <<<"$1"; } get_archive_vers() { sed 's/^[^-]*-//;s/-\(all\|arm64-v8a\|arm-v7a\)\.apk//g' <<<"$1"; }
get_archive_pkg_name() { head -1 <<<"$1" | cut -d- -f1; } get_archive_pkg_name() { awk -F/ '{print $NF}' <<<"$1"; }
# -------------------------------------------------- # --------------------------------------------------
patch_apk() { patch_apk() {
@ -339,11 +339,7 @@ build_rv() {
[ "${args[exclusive_patches]}" = true ] && p_patcher_args+=("--exclusive") [ "${args[exclusive_patches]}" = true ] && p_patcher_args+=("--exclusive")
if [ "$dl_from" = archive ]; then if [ "$dl_from" = archive ]; then
if ! archive_resp=$(get_archive_resp "${args[archive_dlurl]}"); then pkg_name=$(get_archive_pkg_name "${args[archive_dlurl]}")
epr "Could not find ${args[archive_dlurl]}"
return 0
fi
pkg_name=$(get_archive_pkg_name "$archive_resp")
elif [ "$dl_from" = apkmirror ]; then elif [ "$dl_from" = apkmirror ]; then
pkg_name=$(get_apkmirror_pkg_name "${args[apkmirror_dlurl]}") pkg_name=$(get_apkmirror_pkg_name "${args[apkmirror_dlurl]}")
elif [ "$dl_from" = uptodown ]; then elif [ "$dl_from" = uptodown ]; then
@ -368,6 +364,13 @@ build_rv() {
version=$version_mode version=$version_mode
p_patcher_args+=("-f") p_patcher_args+=("-f")
fi fi
if [ "$dl_from" = archive ]; then
local archive_resp
if ! archive_resp=$(get_archive_resp "${args[archive_dlurl]}"); then
epr "Could not find ${args[archive_dlurl]}"
return 0
fi
fi
if [ $get_latest_ver = true ]; then if [ $get_latest_ver = true ]; then
if [ "$dl_from" = archive ]; then if [ "$dl_from" = archive ]; then
archivevers=$(get_archive_vers "$archive_resp") archivevers=$(get_archive_vers "$archive_resp")
@ -409,9 +412,9 @@ build_rv() {
local apkm_arch local apkm_arch
if [ "$arch" = "universal" ]; then if [ "$arch" = "universal" ]; then
apkm_arch="universal" apkm_arch="universal"
elif [ "$arch" = "arm64-v8a" ]; then elif [[ "$arch" = "arm64-v8a"* ]]; then
apkm_arch="arm64-v8a" apkm_arch="arm64-v8a"
elif [ "$arch" = "arm-v7a" ]; then elif [[ "$arch" = "arm-v7a"* ]]; then
apkm_arch="armeabi-v7a" apkm_arch="armeabi-v7a"
else else
apkm_arch="$arch" apkm_arch="$arch"