Refactor to better support Magisk

module/build.gradle.kts

@@ -38,7 +38,7 @@ androidComponents.onVariants { variant ->
         into(moduleDir)
         from("${rootProject.projectDir}/README.md")
         from("$projectDir/src") {
-            exclude("module.prop", "customize.sh", "daemon.sh")
+            exclude("module.prop", "customize.sh", "service.sh")
             filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
         }
         from("$projectDir/src") {
@@ -51,7 +51,7 @@ androidComponents.onVariants { variant ->
             )
         }
         from("$projectDir/src") {
-            include("customize.sh", "daemon.sh")
+            include("customize.sh", "service.sh")
             val tokens = mapOf(
                 "DEBUG" to if (buildTypeLowered == "debug") "true" else "false",
                 "MIN_KSU_VERSION" to "$minKsuVersion",

module/src/customize.sh

@@ -91,7 +91,6 @@ if [ "$KSU" ]; then
 fi
 
 ui_print "- Extracting module files"
-extract "$ZIPFILE" 'daemon.sh'       "$MODPATH"
 extract "$ZIPFILE" 'module.prop'     "$MODPATH"
 extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH"
 extract "$ZIPFILE" 'sepolicy.rule'   "$MODPATH"

module/src/daemon.sh

@@ -1,11 +0,0 @@
-#!/system/bin/sh
-
-DEBUG=@DEBUG@
-
-# shellcheck disable=SC2155
-export NATIVE_BRIDGE=$(getprop ro.dalvik.vm.native.bridge)
-[ "$DEBUG" = true ] && export RUST_BACKTRACE=1
-
-log -p i -t "zygisksu" "Start watchdog"
-resetprop ro.dalvik.vm.native.bridge libzygiskloader.so
-exec "bin/zygiskwd" "watchdog" >/dev/null 2>&1

module/src/post-fs-data.sh

@@ -6,7 +6,8 @@ if [ "$ZYGISK_ENABLED" ]; then
 fi
 
 cd "$MODDIR"
-export NATIVE_BRIDGE=$(getprop ro.dalvik.vm.native.bridge)
+getprop ro.dalvik.vm.native.bridge > /dev/.native_bridge
+resetprop ro.dalvik.vm.native.bridge libzygiskloader.so
 
 if [ "$(which magisk)" ] && [ ".." -ef "/data/adb/modules" ]; then
   for file in ../*; do
@@ -20,5 +21,3 @@ if [ "$(which magisk)" ] && [ ".." -ef "/data/adb/modules" ]; then
     fi
   done
 fi
-
-sh -c "./daemon.sh $@&"

module/src/service.sh

@@ -1,11 +1,15 @@
 #!/system/bin/sh
 
+DEBUG=@DEBUG@
+
 MODDIR=${0%/*}
 if [ "$ZYGISK_ENABLED" ]; then
   exit 0
 fi
 
 cd "$MODDIR"
+export NATIVE_BRIDGE=$(cat /dev/.native_bridge)
+rm /dev/.native_bridge
 
 if [ "$(which magisk)" ] && [ ".." -ef "/data/adb/modules" ]; then
   for file in ../*; do
@@ -19,3 +23,7 @@ if [ "$(which magisk)" ] && [ ".." -ef "/data/adb/modules" ]; then
     fi
   done
 fi
+
+log -p i -t "zygisksu" "Start watchdog"
+[ "$DEBUG" = true ] && export RUST_BACKTRACE=1
+exec "bin/zygiskwd" "watchdog" >/dev/null 2>&1