mirror of
https://github.com/Nezumi-2711/revanced-apk-build.git
synced 2026-09-22 13:38:52 +00:00
fix: apk download
This commit is contained in:
@@ -6,3 +6,5 @@ test*
|
|||||||
/logs
|
/logs
|
||||||
build.md
|
build.md
|
||||||
cmpr
|
cmpr
|
||||||
|
|
||||||
|
utils-refer.sh
|
||||||
|
|||||||
@@ -280,16 +280,36 @@ get_patch_last_supported_ver() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if ! op=$(java -jar "$rv_cli_jar" list-versions "$rv_patches_jar" -f "$pkg_name" 2>&1 | tail -n +3 | awk '{$1=$1}1'); then
|
op=$(patches_list_versions "$rv_cli_jar" "$rv_patches_jar" "$pkg_name") || return 1
|
||||||
epr "list-versions: '$op'"
|
op=$(tail -n +3 <<<"$op" | awk '{$1=$1}1')
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
if [ "$op" = "Any" ]; then return; fi
|
if [ "$op" = "Any" ]; then return; fi
|
||||||
pcount=$(head -1 <<<"$op") pcount=${pcount#*(} pcount=${pcount% *}
|
pcount=$(head -1 <<<"$op") pcount=${pcount#*(} pcount=${pcount% *}
|
||||||
if [ -z "$pcount" ]; then abort "unreachable: '$pcount'"; fi
|
if [ -z "$pcount" ]; then abort "No patches found for '$pkg_name' in patches '$rv_patches_jar'"; fi
|
||||||
grep -F "($pcount patch" <<<"$op" | sed 's/ (.* patch.*//' | get_highest_ver || return 1
|
grep -F "($pcount patch" <<<"$op" | sed 's/ (.* patch.*//' | get_highest_ver || return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
patches_list_versions() {
|
||||||
|
local cli_jar=$1 patches_jar=$2 pkg_name=$3 op
|
||||||
|
if ! op=$(java -jar "$cli_jar" list-versions -p "$patches_jar" -f "$pkg_name" -b 2>&1); then
|
||||||
|
if ! op=$(java -jar "$cli_jar" list-versions "$patches_jar" -f "$pkg_name" 2>&1); then
|
||||||
|
epr "Could not list versions $cli_jar: '$op'"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "$op"
|
||||||
|
}
|
||||||
|
patches_list() {
|
||||||
|
local cli_jar=$1 patches_jar=$2 pkg_name=$3 op
|
||||||
|
if ! op=$(java -jar "$cli_jar" list-patches -p "$patches_jar" --filter-package-name "$pkg_name" --versions --packages -b 2>&1); then
|
||||||
|
if ! op=$(java -jar "$cli_jar" list-patches --patches "$patches_jar" -f "$pkg_name" --with-versions --with-packages 2>&1); then
|
||||||
|
epr "Could not get patches list $cli_jar: '$op'"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
echo "$op"
|
||||||
|
}
|
||||||
|
|
||||||
isoneof() {
|
isoneof() {
|
||||||
local i=$1 v
|
local i=$1 v
|
||||||
shift
|
shift
|
||||||
@@ -555,7 +575,7 @@ build_rv() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
local list_patches
|
local list_patches
|
||||||
list_patches=$(java -jar "$rv_cli_jar" list-patches "$rv_patches_jar" -f "$pkg_name" -v -p 2>&1)
|
list_patches=$(patches_list "$rv_cli_jar" "$rv_patches_jar" "$pkg_name") || return 1
|
||||||
|
|
||||||
local get_latest_ver=false
|
local get_latest_ver=false
|
||||||
if [ "$version_mode" = auto ]; then
|
if [ "$version_mode" = auto ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user