Merge pull request #3 from s1dds/main

Update to v1.7.2
appknox · May 8, 2024 · ccb939c · ccb939c
2 parents 03eec0b + eebaf29
commit ccb939c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,8 +9,8 @@ jobs:
     name: Build Module
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
           java-version: 11

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,8 +6,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.x
       - run: pip3 install cpplint

diff --git a/module.gradle b/module.gradle
@@ -4,8 +4,8 @@ ext {
     moduleName = "ZygiskFrida"
     moduleAuthor = "lico-n"
     moduleDescription = "Injects frida gadget via zygisk."
-    moduleVersion = "v1.7.0"
-    moduleVersionCode = 8
+    moduleVersion = "v1.7.2"
+    moduleVersionCode = 10
 
     // Riru
     moduleMinRiruApiVersion = 24

diff --git a/template/magisk_module/customize.sh b/template/magisk_module/customize.sh
@@ -44,6 +44,21 @@ LIB32_NAME="armeabi-v7a.so"
 LIB64_NAME="arm64-v8a.so"
 LIB32_DEST="$MODPATH/zygisk"
 LIB64_DEST="$MODPATH/zygisk"
+BUSYBOX_BIN=/data/adb/magisk/busybox
+
+if [ ! -f $BUSYBOX_BIN ]; then
+  BUSYBOX_BIN=/data/adb/ksu/bin/busybox
+fi
+
+if [ ! -f $BUSYBOX_BIN ]; then
+  BUSYBOX_BIN=/data/adb/ap/bin/busybox
+fi
+
+if [ ! -f $BUSYBOX_BIN ]; then
+  abort "! unable to locate busybox"
+fi
+
+ui_print "- Using busybox: $BUSYBOX_BIN"
 
 [ "$FLAVOR" = "riru" ] && LIB32_DEST="$MODPATH/riru/lib"
 [ "$FLAVOR" = "riru" ] && LIB64_DEST="$MODPATH/riru/lib64"
@@ -69,7 +84,7 @@ mkdir -p "$TMP_MODULE_DIR"
 extract "$ZIPFILE" "gadget/libgadget-$ARCH.so.xz" "$TMP_MODULE_DIR" true
 mv "$TMP_MODULE_DIR/libgadget-$ARCH.so.xz" "$TMP_MODULE_DIR/libgadget.so.xz"
 rm "$TMP_MODULE_DIR/libgadget.so"
-/data/adb/magisk/busybox unxz "$TMP_MODULE_DIR/libgadget.so.xz"
+$BUSYBOX_BIN unxz "$TMP_MODULE_DIR/libgadget.so.xz"
 rm "$TMP_MODULE_DIR/libgadget.so.xz"
 
 if [ "$IS64BIT" = true ]; then
@@ -79,7 +94,7 @@ if [ "$IS64BIT" = true ]; then
   extract "$ZIPFILE" "gadget/libgadget-$ARCH32.so.xz" "$TMP_MODULE_DIR" true
   mv "$TMP_MODULE_DIR/libgadget-$ARCH32.so.xz" "$TMP_MODULE_DIR/libgadget32.so.xz"
   rm "$TMP_MODULE_DIR/libgadget32.so"
-  /data/adb/magisk/busybox unxz "$TMP_MODULE_DIR/libgadget32.so.xz"
+  $BUSYBOX_BIN unxz "$TMP_MODULE_DIR/libgadget32.so.xz"
   rm "$TMP_MODULE_DIR/libgadget32.so.xz"
 fi