Update README.md

.gitignore

@@ -105,7 +105,4 @@ venv.bak/
 # mypy
 .mypy_cache/
 
-# nix
+test.py
-result*
-
-test.py

README.md

@@ -4,6 +4,20 @@ Script to add GApps and other stuff to Waydroid!
 
 # Installation/Usage
 
+## Dependencies
+
+"lzip" is required for this script to work, install it using your distribution's package manager:
+### Arch, Manjaro and EndeavourOS based distributions:
+	sudo pacman -S lzip
+### Debian and Ubuntu based distributions:
+	sudo apt install lzip
+### RHEL, Fedora and Rocky based distributions:
+	sudo dnf install lzip
+### openSUSE based distributions:
+	sudo zypper install lzip
+
+
+
 ## Interactive terminal interface
 
 ```
@@ -39,18 +53,6 @@ sudo venv/bin/python3 main.py certified
 sudo venv/bin/python3 main.py hack {nodataperm, hidestatusbar}
 ```
 
-## Dependencies
-
-"lzip" is required for this script to work, install it using your distribution's package manager:
-### Arch, Manjaro and EndeavourOS based distributions:
-	sudo pacman -S lzip
-### Debian and Ubuntu based distributions:
-	sudo apt install lzip
-### RHEL, Fedora and Rocky based distributions:
-	sudo dnf install lzip
-### openSUSE based distributions:
-	sudo zypper install lzip
-
 ## Install OpenGapps
 
 ![](assets/1.png)

default.nix

@@ -1,22 +0,0 @@
-with (import <nixpkgs> {});
-
-stdenv.mkDerivation {
-  name = "waydroid_script";
-
-  buildInputs = [
-    (python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ]))
-  ];
-
-  src = ./.;
-
-  postPatch = ''
-    patchShebangs main.py
-  '';
-
-  installPhase = ''
-    mkdir -p $out/libexec
-    cp -r . $out/libexec/waydroid_script
-    mkdir -p $out/bin
-    ln -s $out/libexec/waydroid_script/main.py $out/bin/waydroid_script
-  '';
-}

main.py

@@ -17,7 +17,6 @@ from stuff.ndk import Ndk
 from stuff.nodataperm import Nodataperm
 from stuff.smartdock import Smartdock
 from stuff.widevine import Widevine
-from stuff.fdroidpriv import FDroidPriv
 import tools.helper as helper
 from tools import container
 from tools import images
@@ -87,8 +86,6 @@ def install_app(args):
         install_list.append(MicroG(args.android_version, args.microg_variant))
     if "mitm" in app:
         install_list.append(Mitm(args.ca_cert_file))
-    if "fdroidpriv" in app:
-        install_list.append(FDroidPriv(args.android_version))
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -138,8 +135,6 @@ def remove_app(args):
         remove_list.append(MicroG(args.android_version, args.microg_variant))
     if "mitm" in app:
         remove_list.append(Mitm())
-    if "fdroidpriv" in app:
-        remove_list.append(FDroidPriv(args.android_version))
     if "nodataperm" in app:
         remove_list.append(Nodataperm(args.android_version))
     if "hidestatusbar" in app:
@@ -229,7 +224,7 @@ def interact():
     if not action:
         exit()
 
-    install_choices = ["gapps", "microg", "libndk", "magisk", "smartdock", "fdroidpriv",]
+    install_choices = ["gapps", "microg", "libndk", "magisk", "smartdock",]
     hack_choices = []
     if android_version=="11":
         install_choices.extend(["libhoudini", "widevine"])

stuff/fdroidpriv.py

@@ -1,40 +0,0 @@
-import os
-import shutil
-from stuff.general import General
-
-
-class FDroidPriv(General):
-    id = "fdroid priv"
-    dl_links = {"11": ["https://f-droid.org/repo/org.fdroid.fdroid.privileged.ota_2130.zip",
-                       "6242cab56d197d80c598593a46da62e4"]}
-    partition = "system"
-    dl_file_name = "org.fdroid.fdroid.privileged.ota_2130.zip"
-    dl_link = ...
-    act_md5 = ...
-    extract_to = "/tmp/fdroid_ota_2130"
-    files = [
-        "app/F-Droid.apk"
-        "app/F-Droid/F-Droid.apk"
-        "etc/permissions/permissions_org.fdroid.fdroid.privileged.xml"
-        "priv-app/F-DroidPrivilegedExtension.apk"
-        "priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.apk"
-    ]
-    file_map = {
-      "permissions_org.fdroid.fdroid.privileged.xml": "etc/permissions/permissions_org.fdroid.fdroid.privileged.xml",
-      "F-Droid.apk": "app/F-Droid/F-Droid.apk",
-      "F-DroidPrivilegedExtension.apk": "priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.apk",
-    }
-    def __init__(self, android_version="11") -> None:
-        super().__init__()
-        self.dl_link = self.dl_links[android_version][0]
-        self.act_md5 = self.dl_links[android_version][1]
-
-    def copy(self):
-        for f, d in self.file_map.items():
-            rro_file = os.path.join(
-                self.copy_dir, self.partition, d)
-            rro_dir = os.path.dirname(rro_file)
-            if not os.path.exists(rro_dir):
-                os.makedirs(rro_dir)
-            shutil.copyfile(os.path.join(self.extract_to, f), rro_file)
-

stuff/gapps.py

@@ -15,10 +15,10 @@ class Gapps(General):
             "armeabi-v7a": ["https://sourceforge.net/projects/opengapps/files/arm/20220215/open_gapps-arm-11.0-pico-20220215.zip", "8719519fa32ae83a62621c6056d32814"]
         },
         "13": {
-            "x86_64": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86_64-20231028.zip", "63ccebbf93d45c384f58d7c40049d398"],
+            "x86_64": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-x86_64-20230323.zip", "aba427be1ddd0963121c87a4eda80299"],
-            "x86": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86-20231028.zip", "f12b6a8ed14eedbb4b5b3c932a865956"],
+            "x86": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-x86-20230323.zip", "f02d2f1a3f0a084f13ab4c1b58ad7554"],
-            "arm64-v8a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm64-20231028.zip", "11180da0a5d9f2ed2863882c30a8d556"],
+            "arm64-v8a": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-arm64-20230323.zip", "18484a5622eeccffcea2b43205655d8a"],
-            "armeabi-v7a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm-20231028.zip", "d525c980bac427844aa4cb01628f8a8f"]
+            "armeabi-v7a": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-arm-20230323.zip", "e4c00a7eb1e4dfca0fc6a3e447710264"]
         }
     }
     android_version = ...

stuff/houdini.py

@@ -18,7 +18,7 @@ class Houdini(General):
     extract_to = "/tmp/houdiniunpack"
     init_rc_component = """
 on early-init
-    mount binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+    mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
 
 on property:ro.enable.native.bridge.exec=1
     exec -- /system/bin/sh -c "echo ':arm_exe:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x01\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x02\\\\x00\\\\x28::/system/bin/houdini:P' > /proc/sys/fs/binfmt_misc/register"

stuff/magisk.py

@@ -10,7 +10,7 @@ from tools import container
 class Magisk(General):
     id = "magisk delta"
     partition = "system"
-    dl_link = "https://github.com/casualsnek/miscpackages/raw/main/Magisk_Delta_25210_canary_fdac22ba.apk"
+    dl_link = "https://huskydg.github.io/magisk-files/app-debug.apk"
     dl_file_name = "magisk.apk"
     extract_to = "/tmp/magisk_unpack"
     magisk_dir = os.path.join(partition, "etc", "init", "magisk")

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