Merge branch 'main' into patch-1

README.md

@@ -20,9 +20,7 @@ sudo venv/bin/python3 main.py
 
 ![image-20230430013148814](assets/img/README/image-20230430013148814.png)
 
-
+## Command line
-
-## Command Line
 
 ```bash
 git clone https://github.com/casualsnek/waydroid_script
@@ -42,38 +40,49 @@ 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:
+
+### Arch, Manjaro, and EndeavourOS-based distributions:
+
 	sudo pacman -S lzip
-### Debian and Ubuntu based distributions:
+
+### Debian and Ubuntu-based distributions:
+
 	sudo apt install lzip
-### RHEL, Fedora and Rocky based distributions:
+
+### RHEL, Fedora, and Rocky-based distributions:
+
 	sudo dnf install lzip
-### openSUSE based distributions:
+
+### openSUSE-based distributions:
+
 	sudo zypper install lzip
 
-## Install OpenGapps
+## Install Open GApps
 
 ![](assets/1.png)
 
-Open terminal and switch to the directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py install gapps
 
-Then launch waydroid with:
+Then launch Waydroid with:
 
     waydroid show-full-ui
 
-After waydroid has finished booting, open terminal and switch to directory where "main.py" is located then run:
+After Waydroid has finished booting, open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo python3 main.py google
-Copy the returned numeric ID, then open ["https://google.com/android/uncertified/?pli=1"](https://google.com/android/uncertified/?pli=1). Enter the ID and register it. Wait 10-20 minutes for device to get registered. Then clear Google Play Service's cache and try logging in!
 
+Copy the returned numeric ID, then
+open ["https://google.com/android/uncertified/?pli=1"](https://google.com/android/uncertified/?pli=1). Enter the ID and
+register it. Wait 10–20 minutes for the device to get registered. Then clear Google Play Service's cache and try logging
+in!
 
 ## Install Magisk
 
 ![](assets/2.png)
 
-Open terminal and switch to directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py install magisk
 
@@ -81,21 +90,22 @@ Magisk will be installed on next boot!
 
 Zygisk and modules like LSPosed should work now.
 
-If you want to update Magisk, Please use `Direct Install into system partition` or run this sript again.
+If you want to update Magisk, Please use `Direct Install into system partition` or run this script again.
 
-This script only focuses on Magisk installation, if you need more management, please check https://github.com/nitanmarcel/waydroid-magisk
+This script only focuses on Magisk installation, if you need more management, please
+check https://github.com/nitanmarcel/waydroid-magisk
 
-## Install libndk arm translation 
+## Install libndk ARM translation
 
 libndk_translation from guybrush firmware.
 
 libndk seems to have better performance than libhoudini on AMD.
 
-Open terminal and switch to directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py install libndk
 
-## Install libhoudini arm translation
+## Install libhoudini ARM translation
 
 Intel's libhoudini for intel/AMD x86 CPU, pulled from Microsoft's WSA 11 image
 
@@ -103,7 +113,7 @@ houdini version: 11.0.1b_y.38765.m
 
 houdini64 version: 11.0.1b_z.38765.m
 
-Open terminal and switch to directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py install libhoudini
 
@@ -111,7 +121,7 @@ Open terminal and switch to directory where "main.py" is located then run:
 
 ![](assets/3.png)
 
-Open terminal and switch to directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py install widevine
 
@@ -120,34 +130,38 @@ Open terminal and switch to directory where "main.py" is located then run:
 ![](assets/4.png)
 ![](assets/5.png)
 
-Open terminal and switch to directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py install smartdock
 
 ## Install a self-signed CA certificate
 
-Open terminal and switch to directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py install mitm --ca-cert mycert.pem
 
 ## Granting full permission for apps data (HACK)
 
+This is a temporary hack to combat against the apps permission issue on Android 11. Whenever an app is open, it will
+always enable a property (persist.sys.nodataperm) to make it execute a script to grant the data full permissions (777).
+The **correct** way is to use `sdcardfs` or `esdfs`, both need to recompile the kernel or WayDroid image.
 
-This is a temporary hack to combat against the apps permission issue on Android 11. Whenever an app is open it will always enable a property (persist.sys.nodataperm) to make it execute a script to grant the data full permissions (777). The **correct** way is to use `sdcardfs` or `esdfs`, both need to recompile the kernel or WayDroid image.
+Arknights, PUNISHING: GRAY RAVEN, and other games won't freeze on the black screen.
-
-Arknights, PUNISHING: GRAY RAVEN and other games won't freeze on the black screen.
 
 ![](assets/6.png)
 
-Open terminal and switch to directory where "main.py" is located then run:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
 ```
 sudo venv/bin/python3 main.py hack nodataperm
 ```
-**WARNING**: Tested on `lineage-18.1-20230128-VANILLA-waydroid_x86_64.img`. This script will replace `/system/framework/service.jar`, which may prevent WayDroid from booting. If so, run `sudo venv/bin/python3 main.py uninstall nodataperm` to remove it.
 
+**WARNING**: Tested on `lineage-18.1-20230128-VANILLA-waydroid_x86_64.img`. This script will
+replace `/system/framework/service.jar`, which may prevent Waydroid from booting. If so,
+run `sudo venv/bin/python3 main.py uninstall nodataperm` to remove it.
 
-Or you can run the following commands directly in `sudo waydroid shell`. In this way, every time a new game is installed, you need to run it again, but it's much less risky.
+Or you can run the following commands directly in `sudo waydroid shell`. In this way, every time a new game is
+installed, you need to run it again, but it is much less risky.
 
 ```
 chmod 777 -R /sdcard/Android
@@ -161,7 +175,7 @@ chmod 777 -R /mnt/*/*/*/*/Android/obb
 - https://github.com/supremegamers/device_generic_common/commit/2d47891376c96011b2ee3c1ccef61cb48e15aed6
 - https://github.com/supremegamers/android_frameworks_base/commit/24a08bf800b2e461356a9d67d04572bb10b0e819
 
-## Install microG, Aurora Store and Aurora Droid
+## Install microG, Aurora Store, and Aurora Droid
 
 ![](assets/7.png)
 
@@ -169,7 +183,8 @@ chmod 777 -R /mnt/*/*/*/*/Android/obb
 sudo venv/bin/python3 main.py install microg
 ```
 
-## Hide Status Bar
+## Hide status bar
+
 Before
 ![Before](assets/8.png)
 
@@ -180,15 +195,15 @@ After
 sudo venv/bin/python3 main.py hack hidestatusbar
 ```
 
-
 ## Get Android ID for device registration
 
-You need to register you device with its it before being able to use gapps, this will print out your Android ID which you can use for device registration required for Google apps:
+You need to register your device with its ID before being able to use GApps, this will print out your Android ID, which
-Open terminal and switch to directory where "main.py" is located then run:
+you can use for device registration required for Google apps:
+Open the terminal and switch to the directory where "main.py" is located, then run:
 
     sudo venv/bin/python3 main.py certified
 
-Star this repository if you find this useful, if you encounter problem create an issue on GitHub!
+Star this repository if you find this useful, if you encounter a problem, create an issue on GitHub!
 
 ## Error handling
 
@@ -197,9 +212,10 @@ Star this repository if you find this useful, if you encounter problem create an
 Check [waydroid-magisk](https://github.com/nitanmarcel/waydroid-magisk)
 
 ## Credits
-- [WayDroid](https://github.com/waydroid/waydroid)
+
-- [Magisk Delta](https://huskydg.github.io/magisk-files/)
+- [Waydroid](https://github.com/waydroid/waydroid)
+- [Magisk Delta](https://huskydg.github.io/magisk-files)
 - [microG Project](https://microg.org)
 - [Open GApps](https://opengapps.org)
 - [Smart Dock](https://github.com/axel358/smartdock)
-- [wd-scripts](https://github.com/electrikjesus/wd-scripts/)
+- [wd-scripts](https://github.com/electrikjesus/wd-scripts)

default.nix

@@ -1,4 +1,22 @@
-let
+with (import <nixpkgs> {});
-  pkgs = import <nixpkgs> {};
+
-in
+stdenv.mkDerivation {
-  pkgs.callPackage ./package.nix { }
+  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
+  '';
+}

flake.lock

@@ -1,41 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1707650010,
-        "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,21 +0,0 @@
-{
-  description = "Waydroid Extras Script";
-  inputs = {
-    systems.url = "github:nix-systems/default";
-  };
-  outputs = { self, nixpkgs, systems }:
-  let
-    inherit (nixpkgs) lib;
-    eachSystem = lib.genAttrs (import systems);
-    mkApp = program: { type = "app"; inherit program; };
-  in {
-    packages = eachSystem (system: rec {
-      waydroid_script = nixpkgs.legacyPackages."${system}".callPackage ./package.nix { };
-      default = waydroid_script;
-    });
-    apps = eachSystem (system: rec {
-      waydroid_script = mkApp "${self.outputs.packages.${system}.waydroid_script}/bin/waydroid_script";
-      default = waydroid_script;
-    });
-  };
-}

main.py

@@ -1,11 +1,14 @@
 #!/usr/bin/env python3
-from InquirerPy import inquirer
-from InquirerPy.base.control import Choice
-from InquirerPy.separator import Separator
 import argparse
 import os
 from typing import List
+
+from InquirerPy import inquirer
+from InquirerPy.base.control import Choice
+
+import tools.helper as helper
 from stuff.android_id import AndroidId
+from stuff.fdroidpriv import FDroidPriv
 from stuff.gapps import Gapps
 from stuff.general import General
 from stuff.hidestatusbar import HideStatusBar
@@ -17,13 +20,8 @@ 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
-
-import argparse
-
 from tools.logger import Logger
 
 
@@ -279,9 +277,8 @@ def interact():
 
 
 def main():
-    parser = argparse.ArgumentParser(description='''
+    parser = argparse.ArgumentParser(description='''Does stuff like installing Aapps, installing Magisk, installing 
-    Does stuff like installing Gapps, installing Magisk, installing NDK Translation and getting Android ID for device registration.
+    NDK Translation, and getting Android ID for device registration. Use -h flag for help!''')
-    Use -h  flag for help!''')
 
     subparsers = parser.add_subparsers(title="coomand", dest='command')
     parser.add_argument('-a', '--android-version',
@@ -310,10 +307,10 @@ def main():
 
     install_help = """
 gapps: Install Open GApps (Android 11) or MindTheGapps (Android 13)
-microg: Add microG, Aurora Store and Aurora Droid to WayDriod
+microg: Add microG, Aurora Store, and Aurora Droid to WayDroid
-libndk: Add libndk arm translation, better for AMD CPUs
+libndk: Add libndk ARM translation, better for AMD CPUs
-libhoudini: Add libhoudini arm translation, better for Intel CPUs
+libhoudini: Add libhoudini ARM translation, better for Intel CPUs
-magisk: Install Magisk Delta to WayDroid
+magisk: Install Magisk Delta to Waydroid
 mitm -c CA_CERT_FILE: Install root CA cert into system trust store
 smartdock: A desktop mode launcher for Android
 widevine: Add support for widevine DRM L3

package.nix

@@ -1,32 +0,0 @@
-{ lib,
-  stdenvNoCC,
-  lzip,
-  python3,
-  makeWrapper }:
-let
-  wrappedPath = lib.makeBinPath [ lzip ];
-in stdenvNoCC.mkDerivation {
-  name = "waydroid_script";
-
-  buildInputs = [
-    (python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ]))
-  ];
-
-  nativeBuildInputs = [
-    makeWrapper
-  ];
-
-  src = ./.;
-
-  postPatch = ''
-    patchShebangs main.py
-  '';
-
-  installPhase = ''
-    mkdir -p $out/libexec
-    cp -r . $out/libexec/waydroid_script
-    mkdir -p $out/bin
-    makeShellWrapper $out/libexec/waydroid_script/main.py $out/bin/waydroid_script \
-      --prefix PATH : "${wrappedPath}"
-  '';
-}

stuff/fdroidpriv.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+
 from stuff.general import General
 
 
@@ -26,6 +27,7 @@ class FDroidPriv(General):
         "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]
@@ -39,4 +41,3 @@ class FDroidPriv(General):
             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

@@ -1,5 +1,6 @@
 import os
 import shutil
+
 from stuff.general import General
 from tools.helper import run
 
@@ -9,16 +10,32 @@ class Gapps(General):
     partition = "system"
     dl_links = {
         "11": {
-            "x86_64": ["https://sourceforge.net/projects/opengapps/files/x86_64/20220503/open_gapps-x86_64-11.0-pico-20220503.zip", "5a6d242be34ad1acf92899c7732afa1b"],
+            "x86_64": [
-            "x86": ["https://sourceforge.net/projects/opengapps/files/x86/20220503/open_gapps-x86-11.0-pico-20220503.zip", "efda4943076016d00b40e0874b12ddd3"],
+                "https://sourceforge.net/projects/opengapps/files/x86_64/20220503/open_gapps-x86_64-11.0-pico-20220503.zip",
-            "arm64-v8a": ["https://sourceforge.net/projects/opengapps/files/arm64/20220503/open_gapps-arm64-11.0-pico-20220503.zip", "7790055d34bbfc6fe610b0cd263a7add"],
+                "5a6d242be34ad1acf92899c7732afa1b"],
-            "armeabi-v7a": ["https://sourceforge.net/projects/opengapps/files/arm/20220215/open_gapps-arm-11.0-pico-20220215.zip", "8719519fa32ae83a62621c6056d32814"]
+            "x86": [
+                "https://sourceforge.net/projects/opengapps/files/x86/20220503/open_gapps-x86-11.0-pico-20220503.zip",
+                "efda4943076016d00b40e0874b12ddd3"],
+            "arm64-v8a": [
+                "https://sourceforge.net/projects/opengapps/files/arm64/20220503/open_gapps-arm64-11.0-pico-20220503.zip",
+                "7790055d34bbfc6fe610b0cd263a7add"],
+            "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": [
-            "x86": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86-20231028.zip", "f12b6a8ed14eedbb4b5b3c932a865956"],
+                "https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86_64-20231028.zip",
-            "arm64-v8a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm64-20231028.zip", "11180da0a5d9f2ed2863882c30a8d556"],
+                "63ccebbf93d45c384f58d7c40049d398"],
-            "armeabi-v7a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm-20231028.zip", "d525c980bac427844aa4cb01628f8a8f"]
+            "x86": [
+                "https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86-20231028.zip",
+                "f12b6a8ed14eedbb4b5b3c932a865956"],
+            "arm64-v8a": [
+                "https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm64-20231028.zip",
+                "11180da0a5d9f2ed2863882c30a8d556"],
+            "armeabi-v7a": [
+                "https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm-20231028.zip",
+                "d525c980bac427844aa4cb01628f8a8f"]
         }
     }
     android_version = ...
@@ -124,7 +141,8 @@ class Gapps(General):
                     print("    Processing app package : " +
                           os.path.join(self.extract_to, "Core", lz_file))
                     run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core",
-                        lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
+                                                               lz_file), "-C",
+                         os.path.join(self.extract_to, "appunpack")])
                     app_name = os.listdir(os.path.join(
                         self.extract_to, "appunpack"))[0]
                     xx_dpi = os.listdir(os.path.join(
@@ -145,13 +163,15 @@ class Gapps(General):
                     print("    Processing extra package : " +
                           os.path.join(self.extract_to, "Core", lz_file))
                     run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core",
-                        lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
+                                                               lz_file), "-C",
+                         os.path.join(self.extract_to, "appunpack")])
                     app_name = os.listdir(os.path.join(
                         self.extract_to, "appunpack"))[0]
                     common_content_dirs = os.listdir(os.path.join(
                         self.extract_to, "appunpack", app_name, "common"))
                     for ccdir in common_content_dirs:
-                        shutil.copytree(os.path.join(self.extract_to, "appunpack", app_name, "common", ccdir), os.path.join(
+                        shutil.copytree(os.path.join(self.extract_to, "appunpack", app_name, "common", ccdir),
+                                        os.path.join(
                                             self.copy_dir, self.partition, ccdir), dirs_exist_ok=True)
 
     def copy_13(self):

stuff/general.py

@@ -1,11 +1,12 @@
 import configparser
 import glob
+import hashlib
 import os
 import shutil
 import zipfile
-import hashlib
+
-from tools.helper import download_file, get_download_dir, host
 from tools import container
+from tools.helper import download_file, get_download_dir, host
 from tools.logger import Logger
 
 

stuff/hidestatusbar.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+
 from stuff.general import General
 
 
@@ -14,6 +15,7 @@ class HideStatusBar(General):
     files = [
         "product/overlay/" + dl_file_name
     ]
+
     def __init__(self, android_version="11") -> None:
         super().__init__()
         self.dl_link = self.dl_links[android_version][0]

stuff/houdini.py

@@ -1,6 +1,7 @@
 import os
 import re
 import shutil
+
 from stuff.general import General
 from tools.logger import Logger
 
@@ -10,7 +11,7 @@ class Houdini(General):
     partition = "system"
     dl_links = {
         "11": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip", "fbff756612b4144797fbc99eadcb6653"],
-        "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/9e77896350caccd228b36b2e1b4a994aa4bd48da.zip", "3807fe029559db3037efe245d9e74270"]
+        "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/7e21ea3f63bd89e9e8af54e32da41bd8b65c93a1.zip", "f8cf5db10e5fdb9b77e98e515a9b08c9"]
     }
     act_md5 = ...
     dl_link = ...

stuff/magisk.py

@@ -1,11 +1,13 @@
 import gzip
 import os
-import shutil
 import re
+import shutil
+
 from stuff.general import General
-from tools.helper import download_file, get_data_dir, host
-from tools.logger import Logger
 from tools import container
+from tools.helper import download_file, get_data_dir
+from tools.logger import Logger
+
 
 class Magisk(General):
     id = "magisk delta"
@@ -84,7 +86,8 @@ on property:init.svc.zygote=stopped
                 n_path = os.path.join(magisk_absolute_dir, filename.group(1))
                 shutil.copyfile(o_path, n_path)
         shutil.copyfile(self.download_loc, os.path.join(magisk_absolute_dir, "magisk.apk"))
-        shutil.copytree(os.path.join(self.extract_to, "assets", "chromeos"), os.path.join(magisk_absolute_dir, "chromeos"), dirs_exist_ok=True)
+        shutil.copytree(os.path.join(self.extract_to, "assets", "chromeos"),
+                        os.path.join(magisk_absolute_dir, "chromeos"), dirs_exist_ok=True)
         assets_files = [
             "addon.d.sh",
             "boot_patch.sh",

stuff/microg.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+
 from stuff.general import General
 from tools.logger import Logger
 
@@ -135,7 +136,8 @@ service microg_service /system/bin/sh /system/bin/npem
                         sdks.append(i)
                     elif i:
                         archs.append(i)
-                if len(archs) != 0 and arch not in archs and sub_arch not in archs or len(sdks) != 0 and str(self.sdk) not in sdks:
+                if len(archs) != 0 and arch not in archs and sub_arch not in archs or len(sdks) != 0 and str(
+                        self.sdk) not in sdks:
                     continue
                 else:
                     flag = True

stuff/mitm.py

@@ -1,9 +1,11 @@
 import os
 import shutil
+
 from stuff.general import General
 from tools.helper import run
 from tools.logger import Logger
 
+
 class Mitm(General):
     id = "mitm"
     partition = "system"

stuff/ndk.py

@@ -1,9 +1,11 @@
 import os
 import re
 import shutil
+
 from stuff.general import General
 from tools.logger import Logger
 
+
 class Ndk(General):
     id = "libndk"
     partition = "system"

stuff/nodataperm.py

@@ -1,32 +1,29 @@
 import os
 import re
 import shutil
+
 from stuff.general import General
+from tools import container
 from tools.helper import backup, restore
 from tools.logger import Logger
-from tools import container
 
 
 class Nodataperm(General):
     id = "nodataperm"
     dl_links = {
-        "11": {
+        "11":
-            "x86_64": [
+            {
-                "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
-                "b0e3908ffcf5df8ea62f4929aa680f1a"
-            ],
-        },
-        "13": {
                 "x86_64": [
                     "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
                     "b0e3908ffcf5df8ea62f4929aa680f1a"
                 ],
             },
+        "13": {}
     }
     dl_file_name = "nodataperm.zip"
     extract_to = "/tmp/nodataperm"
-    dl_link = None
+    dl_link = ...
-    act_md5 = None
+    act_md5 = ...
     partition = "system"
     files = [
         "etc/nodataperm.sh",
@@ -40,15 +37,11 @@ class Nodataperm(General):
         super().__init__()
         print("ok")
         arch = self.arch[0]
-        if android_version not in self.dl_links:
-            raise KeyError(f"No download links for Android version '{android_version}'")
-        if arch not in self.dl_links[android_version]:
-            raise KeyError(f"No download links for architecture '{arch}' in Android version '{android_version}'")
         self.dl_link = self.dl_links[android_version][arch][0]
         self.act_md5 = self.dl_links[android_version][arch][1]
 
     def copy(self):
-        name = re.findall(r"([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
+        name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
         extract_path = os.path.join(
             self.extract_to, f"hack_full_data_permission-{name}")
         if not container.use_overlayfs():

stuff/smartdock.py

@@ -1,7 +1,9 @@
 import os
 import shutil
+
 from stuff.general import General
 
+
 class Smartdock(General):
     id = "smartdock"
     dl_link = "https://f-droid.org/repo/cu.axel.smartdock_1100.apk"
@@ -56,7 +58,9 @@ service set_home_activity /system/bin/sh -c "cmd package set-home-activity cu.ax
         shutil.copyfile(os.path.join(self.download_loc),
                         os.path.join(self.copy_dir, self.partition, "priv-app/SmartDock/smartdock.apk"))
 
-        with open(os.path.join(self.copy_dir, self.partition, "etc", "permissions", "permissions_cu.axel.smartdock.xml"), "w") as f:
+        with open(
+                os.path.join(self.copy_dir, self.partition, "etc", "permissions", "permissions_cu.axel.smartdock.xml"),
+                "w") as f:
             f.write(self.permissions)
 
         rc_dir = os.path.join(self.copy_dir, self.partition, "etc/init/smartdock.rc")

stuff/widevine.py

@@ -1,6 +1,7 @@
 import os
 import re
 import shutil
+
 from stuff.general import General
 from tools.logger import Logger
 
@@ -18,7 +19,8 @@ class Widevine(General):
         },
         # "armeabi-v7a": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "fed6898b5cfd2a908cb134df97802554"],
         "arm64-v8a": {
-            "11": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip",
+            "11": [
+                "https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip",
                 "fed6898b5cfd2a908cb134df97802554"]
         }
     }

tools/container.py

@@ -1,9 +1,25 @@
 import configparser
 import os
 import sys
+
+# import dbus
 from tools.helper import run
 from tools.logger import Logger
 
+
+# def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"):
+#     return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf)
+
+# def DBusSessionService(object_path="/SessionManager", intf="id.waydro.SessionManager"):
+#     return dbus.Interface(dbus.SessionBus().get_object("id.waydro.Session", object_path), intf)
+
+# def use_dbus():
+#     try:
+#         DBusContainerService()
+#     except:
+#         return False
+#     return True
+
 def use_overlayfs():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
@@ -20,14 +36,21 @@ def use_overlayfs():
     return False
 
 
+# def get_session():
+#     return DBusContainerService().GetSession()
+
 def stop():
+    # if use_dbus():
+    #     session = DBusContainerService().GetSession()
+    #     if session:
+    #         DBusContainerService().Stop(False)
+    # else:
     run(["waydroid", "container", "stop"])
 
+
 def is_running():
     return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
 
+
 def upgrade():
-    try:
+    run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
-        run(["waydroid", "upgrade"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
-    except subprocess.CalledProcessError:
-        Logger.warning("Waydroid upgrade reported an error (likely system_ota), but we are continuing...")

tools/helper.py

@@ -1,33 +1,41 @@
 import gzip
+import hashlib
 import os
-import re
 import platform
+import re
 import subprocess
 import sys
-import requests
-from tools.logger import Logger
-from tqdm import tqdm
-import hashlib
 from typing import Optional
 
+import requests
+from tqdm import tqdm
+
+from tools.logger import Logger
+
+
 def get_download_dir():
-    if os.environ.get("XDG_CACHE_HOME"):
+    download_loc = ""
+    if os.environ.get("XDG_CACHE_HOME", None) is None:
+        download_loc = os.path.join('/', "home", os.environ.get(
+            "SUDO_USER", os.environ["USER"]), ".cache", "waydroid-script", "downloads"
+                                    )
+    else:
         download_loc = os.path.join(
             os.environ["XDG_CACHE_HOME"], "waydroid-script", "downloads"
         )
-    else:
-        user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
-        download_loc = os.path.join("/", "home", user, ".cache", "waydroid-script", "downloads")
-        
     if not os.path.exists(download_loc):
-        os.makedirs(download_loc, exist_ok=True)
+        os.makedirs(download_loc)
     return download_loc
 
-def get_data_dir():
-    user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
-    return os.path.join("/", "home", user, ".local", "share", "waydroid", "data")
 
-def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
+# not good
+def get_data_dir():
+    return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid",
+                        "data")
+
+
+# execute on host
+def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
     result = subprocess.run(
         args=args,
         env=env,
@@ -35,12 +43,11 @@ def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
         stderr=subprocess.PIPE
     )
 
+    # print(result.stdout.decode())
     if result.stderr:
-        error = result.stderr.decode("utf-8").strip()
+        error = result.stderr.decode("utf-8")
-        
+        if ignore and re.match(ignore, error):
-        if (ignore and re.search(ignore, error)) or "system_ota" in error:
             return result
-        
         Logger.error(error)
         raise subprocess.CalledProcessError(
             returncode=result.returncode,
@@ -49,58 +56,68 @@ def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
         )
     return result
 
+
+# execute on waydroid shell
 def shell(arg: str, env: Optional[str] = None):
-    cmd = ["sudo", "waydroid", "shell"]
+    a = subprocess.Popen(
-    process = subprocess.Popen(
+        args=["sudo", "waydroid", "shell"],
-        args=cmd,
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        stderr=subprocess.PIPE
-        text=True
     )
+    subprocess.Popen(
+        args=["echo",
+              "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"],
+        stdout=a.stdin,
+        stdin=subprocess.PIPE
+    ).communicate()
 
-    boot_classpath = "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"
-    
-    full_script = f"{boot_classpath}\n"
     if env:
-        full_script += f"{env}\n"
+        subprocess.Popen(
-    full_script += f"{arg}\n"
+            args=["echo", env],
+            stdout=a.stdin,
+            stdin=subprocess.PIPE
+        ).communicate()
 
-    stdout, stderr = process.communicate(input=full_script)
+    subprocess.Popen(
+        args=["echo", arg],
+        stdout=a.stdin,
+        stdin=subprocess.PIPE
+    ).communicate()
 
-    if process.returncode != 0 and stderr:
+    a.stdin.close()
-        Logger.error(stderr.strip())
+    if a.stderr.read():
+        Logger.error(a.stderr.read().decode('utf-8'))
         raise subprocess.CalledProcessError(
-            returncode=process.returncode,
+            returncode=a.returncode,
-            cmd=cmd,
+            cmd=a.args,
-            stderr=stderr.encode()
+            stderr=a.stderr
         )
-    return stdout
+    return a.stdout.read().decode("utf-8")
+
 
 def download_file(url, f_name):
+    md5 = ""
     response = requests.get(url, stream=True)
     total_size_in_bytes = int(response.headers.get('content-length', 0))
-    block_size = 1024 
+    block_size = 1024  # 1 Kibibyte
-    
     progress_bar = tqdm(total=total_size_in_bytes, unit='iB', unit_scale=True)
     with open(f_name, 'wb') as file:
         for data in response.iter_content(block_size):
             progress_bar.update(len(data))
             file.write(data)
     progress_bar.close()
-
-    hash_md5 = hashlib.md5()
     with open(f_name, "rb") as f:
-        for chunk in iter(lambda: f.read(4096), b""):
+        bytes = f.read()
-            hash_md5.update(chunk)
+        md5 = hashlib.md5(bytes).hexdigest()
-    
     if total_size_in_bytes != 0 and progress_bar.n != total_size_in_bytes:
-        raise ValueError("Download incomplete or corrupted")
+        raise ValueError("Something went wrong while downloading")
+    return md5
 
-    return hash_md5.hexdigest()
 
 def host():
     machine = platform.machine()
+
     mapping = {
         "i686": ("x86", 32),
         "x86_64": ("x86_64", 64),
@@ -108,37 +125,32 @@ def host():
         "armv7l": ("armeabi-v7a", 32),
         "armv8l": ("armeabi-v7a", 32)
     }
-    
     if machine in mapping:
-        if machine == "x86_64":
+        if mapping[machine] == "x86_64":
-            try:
+            with open("/proc/cpuinfo") as f:
-                with open("/proc/cpuinfo", "r") as f:
                 if "sse4_2" not in f.read():
-                        Logger.warning("CPU does not support SSE4.2, falling back to x86...")
+                    Logger.warning("x86_64 CPU does not support SSE4.2, falling back to x86...")
                     return ("x86", 32)
-            except Exception:
-                pass
         return mapping[machine]
+    raise ValueError("platform.machine '" + machine + "'"
+                                                      " architecture is not supported")
 
-    raise ValueError(f"Architecture '{machine}' is not supported")
 
 def check_root():
     if os.geteuid() != 0:
-        Logger.error("This script must be run as root (sudo). Aborting.")
+        Logger.error("This script must be run as root. Aborting.")
         sys.exit(1)
 
+
 def backup(path):
-    if not os.path.exists(path):
-        return
     gz_filename = path + ".gz"
-    with open(path, "rb") as f_in:
+    with gzip.open(gz_filename, 'wb') as f_gz:
-        with gzip.open(gz_filename, "wb") as f_out:
+        with open(path, "rb") as f:
-            f_out.writelines(f_in)
+            f_gz.write(f.read())
+
 
 def restore(path):
     gz_filename = path + ".gz"
-    if not os.path.exists(gz_filename):
+    with gzip.GzipFile(gz_filename) as f_gz:
-        return
+        with open(path, "wb") as f:
-    with gzip.open(gz_filename, "rb") as f_in:
+            f.writelines(f_gz)
-        with open(path, "wb") as f_out:
-            f_out.write(f_in.read())

tools/images.py

@@ -1,16 +1,18 @@
 import configparser
 import os
-import subprocess
 import sys
+
 from tools.helper import run
 from tools.logger import Logger
 
+
 def mount(image, mount_point):
     umount(mount_point, False)
     if not os.path.exists(mount_point):
         os.makedirs(mount_point)
     run(["mount", "-o", "rw", image, mount_point])
 
+
 def umount(mount_point, exists=True):
     if not os.path.exists(mount_point):
         if not exists:
@@ -23,11 +25,14 @@ def umount(mount_point, exists=True):
         Logger.warning("{} is not a mount point".format(
             mount_point))
 
+
 def resize(img_file, size):
     run(["sudo", "e2fsck", "-y", "-f", img_file], ignore="^e2fsck \d+\.\d+\.\d (.+)\n$")
     run(["sudo", "resize2fs", img_file, size], ignore="^resize2fs \d+\.\d+\.\d (.+)\n$")
 
+
 def get_image_dir():
+    # Read waydroid config to get image location
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
@@ -35,6 +40,6 @@ def get_image_dir():
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg:
-        Logger.error("Required entry in config was not found, Cannot continue!")
+        Logger.error("Required entry in config was not found, Cannot continue!")  # magisk
         sys.exit(1)
     return cfg["waydroid"]["images_path"]