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

fix rv extended

Browse Source
This commit is contained in:
j-hc 2024-12-15 19:50:28 +03:00
parent ce1dd09cc0
commit d4393820a4
No known key found for this signature in database
GPG Key ID: CDF97F1DBFE904CD
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils.sh
View File

@ -222,7 +222,7 @@ semver_validate() {
[ ${#ac} = 0 ] [ ${#ac} = 0 ]
} }
get_patch_last_supported_ver() { get_patch_last_supported_ver() {
local list_patches=$1 pkg_name=$2 inc_sel=$3 _exc_sel=$4p _exclusive=$5 # TODO: resolve using all of these local list_patches=$1 pkg_name=$2 inc_sel=$3 _exc_sel=$4 _exclusive=$5 # TODO: resolve using all of these
local op local op
if [ "$inc_sel" ]; then if [ "$inc_sel" ]; then
if ! op=$(awk '{$1=$1}1' <<<"$list_patches"); then if ! op=$(awk '{$1=$1}1' <<<"$list_patches"); then
@ -415,7 +415,7 @@ get_archive_pkg_name() { echo "$__ARCHIVE_PKG_NAME__"; }
patch_apk() { patch_apk() {
local stock_input=$1 patched_apk=$2 patcher_args=$3 rv_cli_jar=$4 rv_patches_jar=$5 local stock_input=$1 patched_apk=$2 patcher_args=$3 rv_cli_jar=$4 rv_patches_jar=$5
local cmd="java -jar $rv_cli_jar patch $stock_input --purge -o $patched_apk -p $rv_patches_jar --keystore=ks.keystore \ local cmd="env -u GITHUB_REPOSITORY java -jar $rv_cli_jar patch $stock_input --purge -o $patched_apk -p $rv_patches_jar --keystore=ks.keystore \
--keystore-entry-password=123456789 --keystore-password=123456789 --signer=jhc --keystore-entry-alias=jhc $patcher_args" --keystore-entry-password=123456789 --keystore-password=123456789 --signer=jhc --keystore-entry-alias=jhc $patcher_args"
if [ "$OS" = Android ]; then cmd+=" --custom-aapt2-binary=${AAPT2}"; fi if [ "$OS" = Android ]; then cmd+=" --custom-aapt2-binary=${AAPT2}"; fi
pr "$cmd" pr "$cmd"
@ -467,9 +467,12 @@ build_rv() {
epr "empty pkg name, not building ${table}." epr "empty pkg name, not building ${table}."
return 0 return 0
fi fi
local list_patches
list_patches=$(java -jar "$rv_cli_jar" list-patches "$rv_patches_jar" -f "$pkg_name" -v -p 2>&1)
local get_latest_ver=false local get_latest_ver=false
if [ "$version_mode" = auto ]; then if [ "$version_mode" = auto ]; then
if ! version=$(get_patch_last_supported_ver "$pkg_name" "$list_patches" \ if ! version=$(get_patch_last_supported_ver "$list_patches" "$pkg_name" \
"${args[included_patches]}" "${args[excluded_patches]}" "${args[exclusive_patches]}"); then "${args[included_patches]}" "${args[excluded_patches]}" "${args[exclusive_patches]}"); then
exit 1 exit 1
elif [ -z "$version" ]; then get_latest_ver=true; fi elif [ -z "$version" ]; then get_latest_ver=true; fi
@ -519,8 +522,6 @@ build_rv() {
abort "apk signature mismatch '$stock_apk'" abort "apk signature mismatch '$stock_apk'"
fi fi
log "${table}: ${version}" log "${table}: ${version}"
local list_patches
list_patches=$(java -jar "$rv_cli_jar" list-patches "$rv_patches_jar" -f "$pkg_name" -v -p 2>&1)
local microg_patch local microg_patch
microg_patch=$(grep "^Name: " <<<"$list_patches" | grep -i "gmscore\|microg" || :) microg_patch=${microg_patch#*: } microg_patch=$(grep "^Name: " <<<"$list_patches" | grep -i "gmscore\|microg" || :) microg_patch=${microg_patch#*: }