fix: merge conflicts

This commit fixes merge conflicts while merging to main.

module/build.gradle.kts

@@ -53,7 +53,7 @@ androidComponents.onVariants { variant ->
         into(moduleDir)
         from("${rootProject.projectDir}/README.md")
         from("$projectDir/src") {
-            exclude("module.prop", "customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh", "mazoku")
+            exclude("module.prop", "customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh")
             filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
         }
         from("$projectDir/src") {
@@ -65,7 +65,6 @@ androidComponents.onVariants { variant ->
                 "versionCode" to verCode
             )
         }
-        from("$projectDir/src/mazoku")
         from("$projectDir/src") {
             include("customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh")
             val tokens = mapOf(
@@ -125,7 +124,6 @@ androidComponents.onVariants { variant ->
                     set.add(Pair(root.file("sepolicy.rule").asFile, null))
                     set.add(Pair(root.file("post-fs-data.sh").asFile, null))
                     set.add(Pair(root.file("service.sh").asFile, null))
-                    set.add(Pair(root.file("mazoku").asFile, null))
                     set.add(
                         Pair(
                             root.file("lib/libzygisk.so").asFile,

module/src/customize.sh

@@ -104,7 +104,6 @@ extract "$ZIPFILE" 'module.prop'     "$MODPATH"
 extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH"
 extract "$ZIPFILE" 'service.sh'      "$MODPATH"
 extract "$ZIPFILE" 'uninstall.sh'    "$MODPATH"
-extract "$ZIPFILE" 'mazoku'          "$MODPATH"
 mv "$TMPDIR/sepolicy.rule" "$MODPATH"
 
 mkdir "$MODPATH/bin"

module/src/mazoku

@@ -1 +0,0 @@
-c<EFBFBD><EFBFBD><EFBFBD>]<5D><> <20>[{ڭ<11>B<EFBFBD>u<EFBFBD>5=<3D>rEU<45>Z<>ʿ<EFBFBD><CABF><<3C>5<EFBFBD>_o<><6F>
M<>L<>l<EFBFBD><6C><EFBFBD>Q#<23><><EFBFBD>C<EFBFBD>}<7D> e<><65>fjق/<2F>7<EFBFBD><11><>(<28><>g<b<>Rg<07>m<EFBFBD>d

module/src/sepolicy.rule

@@ -1,21 +1,16 @@
-allow zygote tmpfs file *
-allow zygote appdomain_tmpfs file *
+type zygisk_file file_type
+typeattribute zygisk_file mlstrustedobject
+allow zygote zygisk_file sock_file {read write}
 
-type magisk_file file_type
-typeattribute magisk_file mlstrustedobject
-
-allow * magisk_file file *
-allow * magisk_file dir *
-allow * magisk_file fifo_file *
-allow * magisk_file chr_file *
-allow * magisk_file lnk_file *
-allow * magisk_file sock_file *
-
-allow system_server system_server process execmem
-allow zygote zygote process execmem
+allow zygote magisk lnk_file read
+allow zygote unlabeled file {read open}
+allow zygote zygote capability sys_chroot
+allow zygote su dir search
+allow zygote su {lnk_file file} read
 
 allow zygote adb_data_file dir search
-allow zygote mnt_vendor_file dir search
-allow zygote system_file dir mounton
-allow zygote labeledfs filesystem mount
-allow zygote fs_type filesystem unmount
+allow zygote adb_data_file file *
+allow zygote zygote process execmem
+allow system_server system_server process execmem
+allow zygote tmpfs file *
+allow zygote appdomain_tmpfs file *

module/src/service.sh

@@ -15,7 +15,7 @@ if [ "$(which magisk)" ]; then
       if [ -f "$file/service.sh" ]; then
         cd "$file"
         log -p i -t "zygisk-sh" "Manually trigger service.sh for $file"
-        sh "$(realpath ./service.sh)"
+        sh "$(realpath ./service.sh)" &
         cd "$MODDIR"
       fi
     fi