Fix microG Minimal & MinimalIAP installation

Fixed Issue #135

stuff/magisk.py

@@ -10,7 +10,7 @@ from tools import container
 class Magisk(General):
     id = "magisk delta"
     partition = "system"
-    dl_link = "https://github.com/mistrmochov/magiskdeltaorig/raw/main/app-release.apk"
+    dl_link = "https://github.com/casualsnek/miscpackages/raw/main/Magisk_Delta_25210_canary_fdac22ba.apk"
     dl_file_name = "magisk.apk"
     extract_to = "/tmp/magisk_unpack"
     magisk_dir = os.path.join(partition, "etc", "init", "magisk")
@@ -29,28 +29,30 @@ service bootanim /system/bin/bootanimation
     bootanim_component = f"""
 on post-fs-data
     start logd
-    exec u:r:su:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk
+    exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk{host()[1]} --auto-selinux --setup-sbin /system/etc/init/magisk
-    exec u:r:magisk:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk
+    exec u:r:su:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *"
-    exec u:r:update_engine:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk
+    mkdir /sbin/.magisk 700
-    mkdir /dev/magisk_iqeoVo2mDrO 700
+    mkdir /sbin/.magisk/mirror 700
-    exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk64 --auto-selinux --setup-sbin /system/etc/init/magisk /dev/magisk_iqeoVo2mDrO
+    mkdir /sbin/.magisk/block 700
-    exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --post-fs-data
+    copy /system/etc/init/magisk/config /sbin/.magisk/config
+    rm /dev/.magisk_unblock
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --post-fs-data
+    wait /dev/.magisk_unblock 40
+    rm /dev/.magisk_unblock
 
-on nonencrypted
+on zygote-start
-    exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --service
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --service
-
-on property:vold.decrypt=trigger_restart_framework
-    exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --service
 
 on property:sys.boot_completed=1
     mkdir /data/adb/magisk 755
-    exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --boot-complete
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --boot-complete
+    exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /system/etc/init/magisk/magisk.apk ; fi"
    
 on property:init.svc.zygote=restarting
-    exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --zygote-restart
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
    
 on property:init.svc.zygote=stopped
-    exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --zygote-restart
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
     """
 
     def download(self):

stuff/microg.py

@@ -36,11 +36,11 @@ class MicroG(General):
             "6136b383153c2a6797d14fb4d7ca3f97"
         ],
         "Minimal": [
-            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-Minimal-2.11.1-20230429100521.zip"
+            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-Minimal-2.11.1-20230429100521.zip",
             "afb87eb64e7749cfd72c4760d85849da"
         ],
         "MinimalIAP": [
-            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-MinimalIAP-2.11.1-20230429100556.zip"
+            "https://github.com/ayasa520/MinMicroG/releases/download/latest/MinMicroG-MinimalIAP-2.11.1-20230429100556.zip",
             "cc071f4f776cbc16c4c1f707aff1f7fa"
         ]
     }

tools/container.py

@@ -22,7 +22,7 @@ def use_overlayfs():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
-        Logger.error("Cannot locate waydroid config file, reinit waydroid and try again!")
+        Logger.error("Cannot locate waydroid config file, reinit wayland and try again!")
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg:

tools/images.py

@@ -32,7 +32,7 @@ def get_image_dir():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
-        Logger.error("Cannot locate waydroid config file, reinit waydroid and try again!")
+        Logger.error("Cannot locate waydroid config file, reinit wayland and try again!")
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg: