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

structural changes

Browse Source
This commit is contained in:
j-hc
2022-08-09 12:50:08 +03:00
parent 7c83c3ed56
commit 16a2f3e491
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
revanced-magisk/bin/cmp-arm → revanced-magisk/bin/arm/cmp
View File

0
revanced-magisk/bin/xdelta-arm → revanced-magisk/bin/arm/xdelta
View File

0
revanced-magisk/bin/cmp-arm64 → revanced-magisk/bin/arm64/cmp
View File

0
revanced-magisk/bin/xdelta-aarch64 → revanced-magisk/bin/arm64/xdelta
View File

0
revanced-magisk/lib/aarch64/liblzma.so → revanced-magisk/lib/arm64/liblzma.so
View File

0
revanced-magisk/lib/aarch64/liblzma.so.5 → revanced-magisk/lib/arm64/liblzma.so.5
View File

0
revanced-magisk/lib/aarch64/liblzma.so.5.2.5 → revanced-magisk/lib/arm64/liblzma.so.5.2.5
View File

16
scripts/customize.sh
View File

@ -6,21 +6,21 @@ grep __PKGNAME /proc/mounts | while read -r line; do
echo "$line" | cut -d" " -f2 | xargs -r umount -l echo "$line" | cut -d" " -f2 | xargs -r umount -l
done done
set_perm_recursive $MODPATH/bin 0 0 0755 0777
if [ $ARCH = "arm" ]; then if [ $ARCH = "arm" ]; then
export LD_LIBRARY_PATH=$MODPATH/lib/arm export LD_LIBRARY_PATH=$MODPATH/lib/arm
ln -s $MODPATH/bin/xdelta-arm $MODPATH/bin/xdelta alias xdelta='$MODPATH/bin/arm/xdelta'
ln -s $MODPATH/bin/cmp-arm $MODPATH/bin/cmp alias cmp='$MODPATH/bin/arm/cmp'
elif [ $ARCH = "arm64" ]; then elif [ $ARCH = "arm64" ]; then
export LD_LIBRARY_PATH=$MODPATH/lib/aarch64 export LD_LIBRARY_PATH=$MODPATH/lib/arm64
ln -s $MODPATH/bin/xdelta-aarch64 $MODPATH/bin/xdelta alias xdelta='$MODPATH/bin/arm64/xdelta'
ln -s $MODPATH/bin/cmp-arm64 $MODPATH/bin/cmp alias cmp='$MODPATH/bin/arm64/cmp'
else else
abort "ERROR: unsupported arch: ${ARCH}!" abort "ERROR: unsupported arch: ${ARCH}!"
fi fi
chmod +x $MODPATH/bin/xdelta $MODPATH/bin/cmp
BASEPATH=$(pm path __PKGNAME | grep base | cut -d: -f2) 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 "* Installed __PKGNAME and module stock.apk are identical"
ui_print "* Skipping stock APK installation" ui_print "* Skipping stock APK installation"
else else
@ -34,7 +34,7 @@ else
fi fi
ui_print "* Patching __PKGNAME (v__MDVRSN) on the fly" 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!" ui_print "ERROR: Patching failed!"
abort "$op" abort "$op"
fi fi

14
utils.sh
View File

@ -36,7 +36,7 @@ get_prebuilts() {
extract_deb() { extract_deb() {
local output=$1 url=$2 path=$3 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##*/}" local deb_path="${TEMP_DIR}/${url##*/}"
dl_if_dne "$deb_path" "$url" dl_if_dne "$deb_path" "$url"
ar x "$deb_path" data.tar.xz ar x "$deb_path" data.tar.xz
@ -51,17 +51,17 @@ extract_deb() {
get_xdelta() { get_xdelta() {
echo "Getting xdelta binaries" 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/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/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/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" 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/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() { get_cmp() {
echo "Getting cmp binaries" 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/arm64/cmp" "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/arm/cmp" "https://github.com/Zackptg5/Cross-Compiled-Binaries-Android/blob/master/diffutils/cmp-arm?raw=true"
} }
abort() { echo "$1" && exit 1; } abort() { echo "$1" && exit 1; }
@ -85,7 +85,7 @@ reset_template() {
echo "# utils" >"${MODULE_TEMPLATE_DIR}/customize.sh" echo "# utils" >"${MODULE_TEMPLATE_DIR}/customize.sh"
echo "# utils" >"${MODULE_TEMPLATE_DIR}/module.prop" echo "# utils" >"${MODULE_TEMPLATE_DIR}/module.prop"
rm -rf ${MODULE_TEMPLATE_DIR}/rvc.xdelta ${MODULE_TEMPLATE_DIR}/*.apk 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"; } req() { wget -nv -O "$2" --header="$WGET_HEADER" "$1"; }