From 16a2f3e491130a11e30b16c1466965be179f7d43 Mon Sep 17 00:00:00 2001 From: j-hc <25510067+j-hc@users.noreply.github.com> Date: Tue, 9 Aug 2022 12:50:08 +0300 Subject: [PATCH] structural changes --- revanced-magisk/bin/{cmp-arm => arm/cmp} | Bin revanced-magisk/bin/{xdelta-arm => arm/xdelta} | Bin revanced-magisk/bin/{cmp-arm64 => arm64/cmp} | Bin .../bin/{xdelta-aarch64 => arm64/xdelta} | Bin .../lib/{aarch64 => arm64}/liblzma.so | 0 .../lib/{aarch64 => arm64}/liblzma.so.5 | 0 .../lib/{aarch64 => arm64}/liblzma.so.5.2.5 | Bin scripts/customize.sh | 16 ++++++++-------- utils.sh | 14 +++++++------- 9 files changed, 15 insertions(+), 15 deletions(-) rename revanced-magisk/bin/{cmp-arm => arm/cmp} (100%) rename revanced-magisk/bin/{xdelta-arm => arm/xdelta} (100%) rename revanced-magisk/bin/{cmp-arm64 => arm64/cmp} (100%) rename revanced-magisk/bin/{xdelta-aarch64 => arm64/xdelta} (100%) rename revanced-magisk/lib/{aarch64 => arm64}/liblzma.so (100%) rename revanced-magisk/lib/{aarch64 => arm64}/liblzma.so.5 (100%) rename revanced-magisk/lib/{aarch64 => arm64}/liblzma.so.5.2.5 (100%) diff --git a/revanced-magisk/bin/cmp-arm b/revanced-magisk/bin/arm/cmp similarity index 100% rename from revanced-magisk/bin/cmp-arm rename to revanced-magisk/bin/arm/cmp diff --git a/revanced-magisk/bin/xdelta-arm b/revanced-magisk/bin/arm/xdelta similarity index 100% rename from revanced-magisk/bin/xdelta-arm rename to revanced-magisk/bin/arm/xdelta diff --git a/revanced-magisk/bin/cmp-arm64 b/revanced-magisk/bin/arm64/cmp similarity index 100% rename from revanced-magisk/bin/cmp-arm64 rename to revanced-magisk/bin/arm64/cmp diff --git a/revanced-magisk/bin/xdelta-aarch64 b/revanced-magisk/bin/arm64/xdelta similarity index 100% rename from revanced-magisk/bin/xdelta-aarch64 rename to revanced-magisk/bin/arm64/xdelta diff --git a/revanced-magisk/lib/aarch64/liblzma.so b/revanced-magisk/lib/arm64/liblzma.so similarity index 100% rename from revanced-magisk/lib/aarch64/liblzma.so rename to revanced-magisk/lib/arm64/liblzma.so diff --git a/revanced-magisk/lib/aarch64/liblzma.so.5 b/revanced-magisk/lib/arm64/liblzma.so.5 similarity index 100% rename from revanced-magisk/lib/aarch64/liblzma.so.5 rename to revanced-magisk/lib/arm64/liblzma.so.5 diff --git a/revanced-magisk/lib/aarch64/liblzma.so.5.2.5 b/revanced-magisk/lib/arm64/liblzma.so.5.2.5 similarity index 100% rename from revanced-magisk/lib/aarch64/liblzma.so.5.2.5 rename to revanced-magisk/lib/arm64/liblzma.so.5.2.5 diff --git a/scripts/customize.sh b/scripts/customize.sh index 287a369..b77be74 100755 --- a/scripts/customize.sh +++ b/scripts/customize.sh @@ -6,21 +6,21 @@ grep __PKGNAME /proc/mounts | while read -r line; do echo "$line" | cut -d" " -f2 | xargs -r umount -l done +set_perm_recursive $MODPATH/bin 0 0 0755 0777 if [ $ARCH = "arm" ]; then export LD_LIBRARY_PATH=$MODPATH/lib/arm - ln -s $MODPATH/bin/xdelta-arm $MODPATH/bin/xdelta - ln -s $MODPATH/bin/cmp-arm $MODPATH/bin/cmp + alias xdelta='$MODPATH/bin/arm/xdelta' + alias cmp='$MODPATH/bin/arm/cmp' elif [ $ARCH = "arm64" ]; then - export LD_LIBRARY_PATH=$MODPATH/lib/aarch64 - ln -s $MODPATH/bin/xdelta-aarch64 $MODPATH/bin/xdelta - ln -s $MODPATH/bin/cmp-arm64 $MODPATH/bin/cmp + export LD_LIBRARY_PATH=$MODPATH/lib/arm64 + alias xdelta='$MODPATH/bin/arm64/xdelta' + alias cmp='$MODPATH/bin/arm64/cmp' else abort "ERROR: unsupported arch: ${ARCH}!" fi -chmod +x $MODPATH/bin/xdelta $MODPATH/bin/cmp BASEPATH=$(pm path __PKGNAME | grep base | cut -d: -f2) -if [ -n "$BASEPATH" ] && $MODPATH/bin/cmp -s $BASEPATH $MODPATH/stock.apk; then +if [ -n "$BASEPATH" ] && cmp -s $BASEPATH $MODPATH/stock.apk; then ui_print "* Installed __PKGNAME and module stock.apk are identical" ui_print "* Skipping stock APK installation" else @@ -34,7 +34,7 @@ else fi ui_print "* Patching __PKGNAME (v__MDVRSN) on the fly" -if ! op=$($MODPATH/bin/xdelta -d -f -s $BASEPATH $MODPATH/rvc.xdelta $MODPATH/base.apk 2>&1); then +if ! op=$(xdelta -d -f -s $BASEPATH $MODPATH/rvc.xdelta $MODPATH/base.apk 2>&1); then ui_print "ERROR: Patching failed!" abort "$op" fi diff --git a/utils.sh b/utils.sh index e208b8e..90715ae 100755 --- a/utils.sh +++ b/utils.sh @@ -36,7 +36,7 @@ get_prebuilts() { extract_deb() { local output=$1 url=$2 path=$3 - if [ -f "$output" ] || [ -n "$(ls -A "$output")" ]; then return; fi + if [ -f "$output" ] || [ -n "$(ls -A "$output" >/dev/null 2>&1)" ]; then return; fi local deb_path="${TEMP_DIR}/${url##*/}" dl_if_dne "$deb_path" "$url" ar x "$deb_path" data.tar.xz @@ -51,17 +51,17 @@ extract_deb() { get_xdelta() { echo "Getting xdelta binaries" - extract_deb "${MODULE_TEMPLATE_DIR}/bin/xdelta-aarch64" "https://grimler.se/termux/termux-main/pool/main/x/xdelta3/xdelta3_3.1.0-1_aarch64.deb" "./data/data/com.termux/files/usr/bin/xdelta3" - extract_deb "${MODULE_TEMPLATE_DIR}/bin/xdelta-arm" "https://grimler.se/termux/termux-main/pool/main/x/xdelta3/xdelta3_3.1.0-1_arm.deb" "./data/data/com.termux/files/usr/bin/xdelta3" + extract_deb "${MODULE_TEMPLATE_DIR}/bin/arm64/xdelta" "https://grimler.se/termux/termux-main/pool/main/x/xdelta3/xdelta3_3.1.0-1_aarch64.deb" "./data/data/com.termux/files/usr/bin/xdelta3" + extract_deb "${MODULE_TEMPLATE_DIR}/bin/arm/xdelta" "https://grimler.se/termux/termux-main/pool/main/x/xdelta3/xdelta3_3.1.0-1_arm.deb" "./data/data/com.termux/files/usr/bin/xdelta3" echo "Getting liblzma libs" + extract_deb "${MODULE_TEMPLATE_DIR}/lib/arm64/" "https://grimler.se/termux/termux-main/pool/main/libl/liblzma/liblzma_5.2.5-1_aarch64.deb" "./data/data/com.termux/files/usr/lib/*so*" extract_deb "${MODULE_TEMPLATE_DIR}/lib/arm/" "https://grimler.se/termux/termux-main/pool/main/libl/liblzma/liblzma_5.2.5-1_arm.deb" "./data/data/com.termux/files/usr/lib/*so*" - extract_deb "${MODULE_TEMPLATE_DIR}/lib/aarch64/" "https://grimler.se/termux/termux-main/pool/main/libl/liblzma/liblzma_5.2.5-1_aarch64.deb" "./data/data/com.termux/files/usr/lib/*so*" } get_cmp() { echo "Getting cmp binaries" - dl_if_dne "${MODULE_TEMPLATE_DIR}/bin/cmp-arm64" "https://github.com/Zackptg5/Cross-Compiled-Binaries-Android/blob/master/diffutils/cmp-arm64?raw=true" - dl_if_dne "${MODULE_TEMPLATE_DIR}/bin/cmp-arm" "https://github.com/Zackptg5/Cross-Compiled-Binaries-Android/blob/master/diffutils/cmp-arm?raw=true" + dl_if_dne "${MODULE_TEMPLATE_DIR}/bin/arm64/cmp" "https://github.com/Zackptg5/Cross-Compiled-Binaries-Android/blob/master/diffutils/cmp-arm64?raw=true" + dl_if_dne "${MODULE_TEMPLATE_DIR}/bin/arm/cmp" "https://github.com/Zackptg5/Cross-Compiled-Binaries-Android/blob/master/diffutils/cmp-arm?raw=true" } abort() { echo "$1" && exit 1; } @@ -85,7 +85,7 @@ reset_template() { echo "# utils" >"${MODULE_TEMPLATE_DIR}/customize.sh" echo "# utils" >"${MODULE_TEMPLATE_DIR}/module.prop" rm -rf ${MODULE_TEMPLATE_DIR}/rvc.xdelta ${MODULE_TEMPLATE_DIR}/*.apk - mkdir -p ${MODULE_TEMPLATE_DIR}/lib/arm ${MODULE_TEMPLATE_DIR}/lib/aarch64 ${MODULE_TEMPLATE_DIR}/bin + mkdir -p ${MODULE_TEMPLATE_DIR}/lib/arm ${MODULE_TEMPLATE_DIR}/lib/arm64 ${MODULE_TEMPLATE_DIR}/bin/arm ${MODULE_TEMPLATE_DIR}/bin/arm64 } req() { wget -nv -O "$2" --header="$WGET_HEADER" "$1"; }