From aaec97fe16e8cc847143e726e6616ae91a4b5c1c Mon Sep 17 00:00:00 2001
From: Nullptr <noreply@nullptr.icu>
Date: Tue, 31 Jan 2023 10:19:59 +0800
Subject: [PATCH] Support Magisk

---
 README.md               | 10 ++++++++++
 module/build.gradle.kts | 18 +++++++++++++++---
 module/src/customize.sh |  8 ++++----
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2e42bce
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+# Zygisk on KernelSU
+
+## Running on Magisk
+
+It is possible to run Zygisksu on Magisk with a few steps:
+
+1. `mkdir /data/adb/ksu`
+2. `ln -s /data/adb/modules /data/adb/ksu/modules`
+3. `cp $(which resetprop) /data/adb/ksu/resetprop`
+4. Remove ` && [ "$KSU" == "true" ]` in `customize.sh`
diff --git a/module/build.gradle.kts b/module/build.gradle.kts
index 4cb6f7e..b676670 100644
--- a/module/build.gradle.kts
+++ b/module/build.gradle.kts
@@ -84,7 +84,7 @@ androidComponents.onVariants { variant ->
         commandLine("adb", "push", zipTask.outputs.files.singleFile.path, "/data/local/tmp")
     }
 
-    val installTask = task("install$variantCapped") {
+    val installKsuTask = task("installKsu$variantCapped") {
         group = "module"
         dependsOn(pushTask)
         doLast {
@@ -100,9 +100,21 @@ androidComponents.onVariants { variant ->
         }
     }
 
-    task<Exec>("installAndReboot$variantCapped") {
+    val installMagiskTask = task<Exec>("installMagisk$variantCapped") {
         group = "module"
-        dependsOn(installTask)
+        dependsOn(pushTask)
+        commandLine("adb", "shell", "su", "-c", "magisk --install-module /data/local/tmp/$zipFileName")
+    }
+
+    task<Exec>("installKsuAndReboot$variantCapped") {
+        group = "module"
+        dependsOn(installKsuTask)
+        commandLine("adb", "reboot")
+    }
+
+    task<Exec>("installMagiskAndReboot$variantCapped") {
+        group = "module"
+        dependsOn(installMagiskTask)
         commandLine("adb", "reboot")
     }
 }
diff --git a/module/src/customize.sh b/module/src/customize.sh
index 11b5108..015d194 100644
--- a/module/src/customize.sh
+++ b/module/src/customize.sh
@@ -63,7 +63,7 @@ if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then
   if [ "$HAS32BIT" = ture ]; then
     ui_print "- Extracting x86 libraries"
     extract "$ZIPFILE" 'bin/x86/zygiskd' "$MODPATH/bin/zygiskd32" true
-    rename "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
     extract "$ZIPFILE" 'lib/x86/libinjector.so' "$MODPATH/system/lib" true
     extract "$ZIPFILE" 'lib/x86/libzygiskloader.so' "$MODPATH/system/lib" true
     ln -sf "zygiskd32" "$MODPATH/bin/zygiskwd"
@@ -72,7 +72,7 @@ if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then
   if [ "$HAS64BIT" = true ]; then
     ui_print "- Extracting x64 libraries"
     extract "$ZIPFILE" 'bin/x86_64/zygiskd' "$MODPATH/bin/zygiskd64" true
-    rename "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
     extract "$ZIPFILE" 'lib/x86_64/libinjector.so' "$MODPATH/system/lib64" true
     extract "$ZIPFILE" 'lib/x86_64/libzygiskloader.so' "$MODPATH/system/lib64" true
     ln -sf "zygiskd64" "$MODPATH/bin/zygiskwd"
@@ -81,7 +81,7 @@ else
   if [ "$HAS32BIT" = true ]; then
     ui_print "- Extracting arm libraries"
     extract "$ZIPFILE" 'bin/armeabi-v7a/zygiskd' "$MODPATH/bin" true
-    rename "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
     extract "$ZIPFILE" 'lib/armeabi-v7a/libinjector.so' "$MODPATH/system/lib" true
     extract "$ZIPFILE" 'lib/armeabi-v7a/libzygiskloader.so' "$MODPATH/system/lib" true
     ln -sf "zygiskd32" "$MODPATH/bin/zygiskwd"
@@ -90,7 +90,7 @@ else
   if [ "$HAS64BIT" = true ]; then
     ui_print "- Extracting arm64 libraries"
     extract "$ZIPFILE" 'bin/arm64-v8a/zygiskd' "$MODPATH/bin" true
-    rename "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
+    mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
     extract "$ZIPFILE" 'lib/arm64-v8a/libinjector.so' "$MODPATH/system/lib64" true
     extract "$ZIPFILE" 'lib/arm64-v8a/libzygiskloader.so' "$MODPATH/system/lib64" true
     ln -sf "zygiskd64" "$MODPATH/bin/zygiskwd"