From ac8296f097db4fa3c290036ba6c885356bb2f30b Mon Sep 17 00:00:00 2001 From: Keeperorowner Date: Sat, 19 Oct 2024 16:27:14 +0800 Subject: [PATCH 1/3] Update customize.sh --- magisk-loader/magisk_module/customize.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/magisk-loader/magisk_module/customize.sh b/magisk-loader/magisk_module/customize.sh index fc35ebfeabe..1625f51a775 100644 --- a/magisk-loader/magisk_module/customize.sh +++ b/magisk-loader/magisk_module/customize.sh @@ -72,6 +72,7 @@ fi ui_print "- Extracting module files" extract "$ZIPFILE" 'module.prop' "$MODPATH" +extract "$ZIPFILE" 'action.sh' "$MODPATH" extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH" extract "$ZIPFILE" 'service.sh' "$MODPATH" extract "$ZIPFILE" 'uninstall.sh' "$MODPATH" @@ -83,18 +84,7 @@ rm -f /data/adb/lspd/manager.apk extract "$ZIPFILE" 'manager.apk' "$MODPATH" if [ "$FLAVOR" == "zygisk" ]; then - # extract for KernelSU and APatch - if [ "$KSU" ] || [ "$APATCH" ]; then - # webroot only for zygisk - mkdir -p "$MODPATH/webroot" - extract "$ZIPFILE" "webroot/index.html" "$MODPATH/webroot" true - # evaluate if use awk or tr -s ' ' | cut -d' ' -f5 - SRCJS=$(unzip -l "$ZIPFILE" | grep "webroot/src" | grep -v sha256 | awk '{print $4}') - extract "$ZIPFILE" "$SRCJS" "$MODPATH/webroot" true - fi - mkdir -p "$MODPATH/zygisk" - if [ "$ARCH" = "arm" ] || [ "$ARCH" = "arm64" ]; then extract "$ZIPFILE" "lib/armeabi-v7a/liblspd.so" "$MODPATH/zygisk" true mv "$MODPATH/zygisk/liblspd.so" "$MODPATH/zygisk/armeabi-v7a.so" From 27a7ce9d2e78587219c9fdbd6f665ed52383aded Mon Sep 17 00:00:00 2001 From: Keeperorowner Date: Sat, 19 Oct 2024 16:27:58 +0800 Subject: [PATCH 2/3] Create action.sh --- magisk-loader/magisk_module/action.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 magisk-loader/magisk_module/action.sh diff --git a/magisk-loader/magisk_module/action.sh b/magisk-loader/magisk_module/action.sh new file mode 100644 index 00000000000..42359ce19ac --- /dev/null +++ b/magisk-loader/magisk_module/action.sh @@ -0,0 +1,4 @@ +DEFAULT_MANAGER_PACKAGE_NAME=org.lsposed.manager +INJECTED_PACKAGE_NAME=com.android.shell + +am start -c "${DEFAULT_MANAGER_PACKAGE_NAME}.LAUNCH_MANAGER" "${INJECTED_PACKAGE_NAME}/.BugreportWarningActivity" From 2c6ba5abe49e07fa596c17e6c5393bc696144773 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Thu, 31 Oct 2024 14:49:47 +0100 Subject: [PATCH 3/3] Keep WebUI as fallback --- magisk-loader/magisk_module/customize.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/magisk-loader/magisk_module/customize.sh b/magisk-loader/magisk_module/customize.sh index 1625f51a775..5db192671a1 100644 --- a/magisk-loader/magisk_module/customize.sh +++ b/magisk-loader/magisk_module/customize.sh @@ -84,7 +84,18 @@ rm -f /data/adb/lspd/manager.apk extract "$ZIPFILE" 'manager.apk' "$MODPATH" if [ "$FLAVOR" == "zygisk" ]; then + # extract for KernelSU and APatch + if [ "$KSU" ] || [ "$APATCH" ]; then + # webroot only for zygisk + mkdir -p "$MODPATH/webroot" + extract "$ZIPFILE" "webroot/index.html" "$MODPATH/webroot" true + # evaluate if use awk or tr -s ' ' | cut -d' ' -f5 + SRCJS=$(unzip -l "$ZIPFILE" | grep "webroot/src" | grep -v sha256 | awk '{print $4}') + extract "$ZIPFILE" "$SRCJS" "$MODPATH/webroot" true + fi + mkdir -p "$MODPATH/zygisk" + if [ "$ARCH" = "arm" ] || [ "$ARCH" = "arm64" ]; then extract "$ZIPFILE" "lib/armeabi-v7a/liblspd.so" "$MODPATH/zygisk" true mv "$MODPATH/zygisk/liblspd.so" "$MODPATH/zygisk/armeabi-v7a.so"