Fix microG Minimal & MinimalIAP installation

Fixed Issue #135

main.py

@@ -21,29 +21,45 @@ from stuff.fdroidpriv import FDroidPriv
 import tools.helper as helper
 from tools import container
 from tools import images
+
+import argparse
+
 from tools.logger import Logger
 
-def get_certified():
+
+def get_certified(args):
     AndroidId().get_id()
 
+
 def mount(partition, copy_dir):
-    img = os.path.join(images.get_image_dir(), f"{partition}.img")
+    img = os.path.join(images.get_image_dir(), partition+".img")
-    mount_point = os.path.join(copy_dir) if partition == "system" else os.path.join(copy_dir, partition)
+    mount_point = ""
-    Logger.info(f"Mounting {img} to {mount_point}")
+    if partition == "system":
+        mount_point = os.path.join(copy_dir)
+    else:
+        mount_point = os.path.join(copy_dir, partition)
+    Logger.info("Mounting {} to {}".format(img, mount_point))
     images.mount(img, mount_point)
 
+
 def resize(partition):
-    img = os.path.join(images.get_image_dir(), f"{partition}.img")
+    img = os.path.join(images.get_image_dir(), partition+".img")
-    img_size = int(os.path.getsize(img) / (1024 * 1024))
+    img_size = int(os.path.getsize(img)/(1024*1024))
-    new_size = f"{img_size + 500}M"
+    new_size = "{}M".format(img_size+500)
-    Logger.info(f"Resizing {img} to {new_size}")
+    Logger.info("Resizing {} to {}".format(img, new_size))
     images.resize(img, new_size)
 
+
 def umount(partition, copy_dir):
-    mount_point = os.path.join(copy_dir) if partition == "system" else os.path.join(copy_dir, partition)
+    mount_point = ""
-    Logger.info(f"Unmounting {mount_point}")
+    if partition == "system":
+        mount_point = os.path.join(copy_dir)
+    else:
+        mount_point = os.path.join(copy_dir, partition)
+    Logger.info("Umounting {}".format(mount_point))
     images.umount(mount_point)
 
+
 def install_app(args):
     install_list: List[General] = []
     app = args.app
@@ -102,6 +118,7 @@ def install_app(args):
 
     container.upgrade()
 
+
 def remove_app(args):
     remove_list: List[General] = []
     app = args.app
@@ -141,8 +158,10 @@ def remove_app(args):
 
     container.upgrade()
 
+
 def hack_option(args):
-    Logger.warning("If these hacks cause any problems, run `sudo python main.py remove <hack_option>` to remove")
+    Logger.warning(
+        "If these hacks cause any problems, run `sudo python main.py remove <hack_option>` to remove")
 
     hack_list: List[General] = []
     options = args.option_name
@@ -179,8 +198,10 @@ def hack_option(args):
 
     container.upgrade()
 
+
 def interact():
     os.system("clear")
+    args = argparse.Namespace()
     android_version = inquirer.select(
         message="Select Android version",
         instruction="(\u2191\u2193 Select Item)",
@@ -193,12 +214,15 @@ def interact():
     ).execute()
     if not android_version:
         exit()
-
+    args.android_version = android_version
-    args = argparse.Namespace(android_version=android_version, microg_variant="Standard")
-
     action = inquirer.select(
         message="Please select an action",
-        choices=["Install", "Remove", "Hack", "Get Google Device ID to Get Certified"],
+        choices=[
+            "Install",
+            "Remove",
+            "Hack",
+            "Get Google Device ID to Get Certified"
+        ],
         instruction="([↑↓]: Select Item)",
         default=None,
     ).execute()
@@ -207,7 +231,7 @@ def interact():
 
     install_choices = ["gapps", "microg", "libndk", "magisk", "smartdock", "fdroidpriv",]
     hack_choices = []
-    if android_version == "11":
+    if android_version=="11":
         install_choices.extend(["libhoudini", "widevine"])
         hack_choices.extend(["nodataperm", "hidestatusbar"])
 
@@ -219,7 +243,8 @@ def interact():
             invalid_message="should be at least 1 selection",
             choices=install_choices
         ).execute()
-        microg_variants = ["Standard", "NoGoolag", "UNLP", "Minimal", "MinimalIAP"]
+        microg_variants = ["Standard", "NoGoolag",
+                           "UNLP", "Minimal", "MinimalIAP"]
         if "microg" in apps:
             microg_variant = inquirer.select(
                 message="Select MicroG variant",
@@ -238,7 +263,7 @@ def interact():
             choices=[*install_choices, *hack_choices]
         ).execute()
         args.app = apps
-        args.microg_variant = "Standard"
+        args.microg_variant="Standard"
         remove_app(args)
     elif action == "Hack":
         apps = inquirer.checkbox(
@@ -251,14 +276,15 @@ def interact():
         args.option_name = apps
         hack_option(args)
     elif action == "Get Google Device ID to Get Certified":
-        get_certified()
+        AndroidId().get_id()
+
 
 def main():
     parser = argparse.ArgumentParser(description='''
     Does stuff like installing Gapps, installing Magisk, installing NDK Translation and getting Android ID for device registration.
     Use -h  flag for help!''')
 
-    subparsers = parser.add_subparsers(title="command", dest='command')
+    subparsers = parser.add_subparsers(title="coomand", dest='command')
     parser.add_argument('-a', '--android-version',
                         dest='android_version',
                         help='Specify the Android version',
@@ -270,7 +296,8 @@ def main():
         'certified', help='Get device ID to obtain Play Store certification')
     certified.set_defaults(func=get_certified)
 
-    install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "mitm", "smartdock", "widevine"]
+    install_choices = ["gapps", "microg", "libndk", "libhoudini",
+                       "magisk", "mitm", "smartdock", "widevine"]
     hack_choices = ["nodataperm", "hidestatusbar"]
     micrg_variants = ["Standard", "NoGoolag", "UNLP", "Minimal", "MinimalIAP"]
     remove_choices = install_choices
@@ -279,6 +306,7 @@ def main():
         "dest": "app",
         "type": str,
         "nargs": '+',
+        # "metavar":"",
     }
 
     install_help = """
@@ -316,12 +344,15 @@ widevine: Add support for widevine DRM L3
     hack_parser.set_defaults(func=hack_option)
 
     args = parser.parse_args()
+    args.microg_variant = "Standard"
     if hasattr(args, 'func'):
+        args_dict = vars(args)
         helper.check_root()
         args.func(args)
     else:
         helper.check_root()
         interact()
 
+
 if __name__ == "__main__":
     main()

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"
         ]
     }