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

update customize.sh

Browse Source
This commit is contained in:
j-hc 2024-06-03 11:11:00 +03:00
parent fcc9cd7dd2
commit 90ab179a52
No known key found for this signature in database
GPG Key ID: CDF97F1DBFE904CD
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.sh
View File

@ -146,17 +146,24 @@ for table_name in $(toml_get_table_names); do
app_args[dpi]=$(toml_get "$t" apkmirror-dpi) || app_args[dpi]="nodpi" app_args[dpi]=$(toml_get "$t" apkmirror-dpi) || app_args[dpi]="nodpi"
table_name_f=${table_name,,} table_name_f=${table_name,,}
table_name_f=${table_name_f// /-} table_name_f=${table_name_f// /-}
app_args[module_prop_name]=$(toml_get "$t" module-prop-name) || app_args[module_prop_name]="${table_name_f}-jhc" app_args[module_prop_name]=$(toml_get "$t" module-prop-name) || {
app_args[module_prop_name]="${table_name_f}-jhc"
if [ "${app_args[arch]}" = "arm64-v8a" ]; then
app_args[module_prop_name]="${app_args[module_prop_name]}-arm64"
elif [ "${app_args[arch]}" = "arm-v7a" ]; then
app_args[module_prop_name]="${app_args[module_prop_name]}-arm"
fi
}
if [ "${app_args[arch]}" = both ]; then if [ "${app_args[arch]}" = both ]; then
app_args[table]="$table_name (arm64-v8a)" app_args[table]="$table_name (arm64-v8a)"
app_args[module_prop_name]="${app_args[module_prop_name]}-arm64"
app_args[arch]="arm64-v8a" app_args[arch]="arm64-v8a"
app_args[module_prop_name]="${app_args[module_prop_name]}-arm64"
idx=$((idx + 1)) idx=$((idx + 1))
build_rv "$(declare -p app_args)" & build_rv "$(declare -p app_args)" &
app_args[table]="$table_name (arm-v7a)" app_args[table]="$table_name (arm-v7a)"
app_args[module_prop_name]="${app_args[module_prop_name]}-arm"
app_args[arch]="arm-v7a" app_args[arch]="arm-v7a"
app_args[module_prop_name]="${app_args[module_prop_name]}-arm"
if ((idx >= PARALLEL_JOBS)); then wait -n; fi if ((idx >= PARALLEL_JOBS)); then wait -n; fi
idx=$((idx + 1)) idx=$((idx + 1))
build_rv "$(declare -p app_args)" & build_rv "$(declare -p app_args)" &

5
revanced-magisk/customize.sh
View File

@ -1,4 +1,3 @@
#!/system/bin/sh
. "$MODPATH/config" . "$MODPATH/config"
ui_print "" ui_print ""
@ -106,10 +105,10 @@ if [ $INS = true ]; then
fi fi
BASEPATHLIB=${BASEPATH}/lib/${ARCH} BASEPATHLIB=${BASEPATH}/lib/${ARCH}
if [ -z "$(ls -A1 "${BASEPATHLIB}")" ]; then if [ -z "$(ls -A1 "$BASEPATHLIB")" ]; then
ui_print "* Extracting native libs" ui_print "* Extracting native libs"
mkdir -p "$BASEPATHLIB" mkdir -p "$BASEPATHLIB"
if ! op=$(unzip -j "$MODPATH/$PKG_NAME.apk lib/${ARCH_LIB}/"* -d "$BASEPATHLIB" 2>&1); then if ! op=$(unzip -j "$MODPATH"/"$PKG_NAME".apk lib/"${ARCH_LIB}"/* -d "$BASEPATHLIB" 2>&1); then
ui_print "ERROR: extracting native libs failed" ui_print "ERROR: extracting native libs failed"
abort "$op" abort "$op"
fi fi

1
utils.sh
View File

@ -435,7 +435,6 @@ build_rv() {
elif [ "$arch" = "arm-v7a" ]; then elif [ "$arch" = "arm-v7a" ]; then
patcher_args+=("--rip-lib arm64-v8a") patcher_args+=("--rip-lib arm64-v8a")
fi fi
fi fi
fi fi
if [ ! -f "$patched_apk" ] || [ "$REBUILD" = true ]; then if [ ! -f "$patched_apk" ] || [ "$REBUILD" = true ]; then