Merge branch 'main' into main

README.md

@@ -20,7 +20,9 @@ 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
@@ -40,49 +42,38 @@ 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 Open GApps
+## Install OpenGapps
 
 ![](assets/1.png)
 
-Open the terminal and switch to the directory where "main.py" is located, then run:
+Open 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 the terminal and switch to the directory where "main.py" is located, then run:
+After waydroid has finished booting, open terminal and switch to 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 the terminal and switch to the directory where "main.py" is located, then run:
+Open terminal and switch to directory where "main.py" is located then run:
 
     sudo venv/bin/python3 main.py install magisk
 
@@ -90,22 +81,21 @@ 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 script again.
+If you want to update Magisk, Please use `Direct Install into system partition` or run this sript again.
 
-This script only focuses on Magisk installation, if you need more management, please
+This script only focuses on Magisk installation, if you need more management, please check https://github.com/nitanmarcel/waydroid-magisk
-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 the terminal and switch to the directory where "main.py" is located, then run:
+Open terminal and switch to 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
 
@@ -113,7 +103,7 @@ houdini version: 11.0.1b_y.38765.m
 
 houdini64 version: 11.0.1b_z.38765.m
 
-Open the terminal and switch to the directory where "main.py" is located, then run:
+Open terminal and switch to directory where "main.py" is located then run:
 
     sudo venv/bin/python3 main.py install libhoudini
 
@@ -121,7 +111,7 @@ Open the terminal and switch to the directory where "main.py" is located, then r
 
 ![](assets/3.png)
 
-Open the terminal and switch to the directory where "main.py" is located, then run:
+Open terminal and switch to directory where "main.py" is located then run:
 
     sudo venv/bin/python3 main.py install widevine
 
@@ -130,38 +120,34 @@ Open the terminal and switch to the directory where "main.py" is located, then r
 ![](assets/4.png)
 ![](assets/5.png)
 
-Open the terminal and switch to the directory where "main.py" is located, then run:
+Open terminal and switch to directory where "main.py" is located then run:
 
     sudo venv/bin/python3 main.py install smartdock
 
 ## Install a self-signed CA certificate
 
-Open the terminal and switch to the directory where "main.py" is located, then run:
+Open terminal and switch to 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.
 
-Arknights, PUNISHING: GRAY RAVEN, and other games won't freeze on the black screen.
+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.
 
 ![](assets/6.png)
 
-Open the terminal and switch to the directory where "main.py" is located, then run:
+Open terminal and switch to 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
+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.
-installed, you need to run it again, but it is much less risky.
 
 ```
 chmod 777 -R /sdcard/Android
@@ -175,7 +161,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)
 
@@ -183,8 +169,7 @@ 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)
 
@@ -195,15 +180,15 @@ After
 sudo venv/bin/python3 main.py hack hidestatusbar
 ```
 
+
 ## Get Android ID for device registration
 
-You need to register your device with its ID before being able to use GApps, this will print out your Android ID, which
+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 can use for device registration required for Google apps:
+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 certified
 
-Star this repository if you find this useful, if you encounter a problem, create an issue on GitHub!
+Star this repository if you find this useful, if you encounter problem create an issue on GitHub!
 
 ## Error handling  
 
@@ -212,10 +197,9 @@ Star this repository if you find this useful, if you encounter a problem, create
 Check [waydroid-magisk](https://github.com/nitanmarcel/waydroid-magisk)
 
 ## Credits
-
+- [WayDroid](https://github.com/waydroid/waydroid)
-- [Waydroid](https://github.com/waydroid/waydroid)
+- [Magisk Delta](https://huskydg.github.io/magisk-files/)
-- [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/)

main.py

@@ -1,14 +1,11 @@
 #!/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
@@ -20,8 +17,14 @@ 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
+from stuff.gps import GPS
+import tools.helper as helper
 from tools import container
 from tools import images
+
+import argparse
+
 from tools.logger import Logger
 
 
@@ -30,7 +33,7 @@ def get_certified(args):
 
 
 def mount(partition, copy_dir):
-    img = os.path.join(images.get_image_dir(), partition + ".img")
+    img = os.path.join(images.get_image_dir(), partition+".img")
     mount_point = ""
     if partition == "system":
         mount_point = os.path.join(copy_dir)
@@ -41,9 +44,9 @@ def mount(partition, copy_dir):
 
 
 def resize(partition):
-    img = os.path.join(images.get_image_dir(), 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 = "{}M".format(img_size + 500)
+    new_size = "{}M".format(img_size+500)
     Logger.info("Resizing {} to {}".format(img, new_size))
     images.resize(img, new_size)
 
@@ -87,6 +90,8 @@ def install_app(args):
         install_list.append(Mitm(args.ca_cert_file))
     if "fdroidpriv" in app:
         install_list.append(FDroidPriv(args.android_version))
+    if "gps" in app:
+        install_list.append(GPS(args.android_version, args.gps_host, args.baud_rate))
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -113,8 +118,7 @@ def install_app(args):
     if not container.use_overlayfs():
         umount("vendor", copy_dir)
         umount("system", copy_dir)
-
+        container.upgrade()
-    container.upgrade()
 
 
 def remove_app(args):
@@ -142,6 +146,8 @@ def remove_app(args):
         remove_list.append(Nodataperm(args.android_version))
     if "hidestatusbar" in app:
         remove_list.append(HideStatusBar())
+    if "gps" in app:
+        remove_list.append(GPS())
 
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
@@ -168,6 +174,7 @@ def hack_option(args):
     if "hidestatusbar" in options:
         hack_list.append(HideStatusBar())
     
+
     if not container.use_overlayfs():
         copy_dir = "/tmp/waydroid"
         container.stop()
@@ -227,7 +234,10 @@ def interact():
     if not action:
         exit()
 
-    install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine",]
+
+    install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine", "gps",]
+    baud_rate_choices = ["9600", "19200", "38400", "57600", "115200"]
+
     hack_choices = []
     if android_version=="11":
         hack_choices.extend(["nodataperm", "hidestatusbar"])
@@ -249,6 +259,20 @@ def interact():
                 default="Standard",
             ).execute()
             args.microg_variant = microg_variant
+        if "gps" in apps:
+            gps_host = inquirer.text(
+                message="Enter GPS host (default: /dev/ttyGPSD)",
+                default="/dev/ttyGPSD",
+            ).execute()
+            args.gps_host = gps_host
+            baud_rate = inquirer.select(
+                message="Enter baud rate (default: 9600)",
+                instruction="([\u2191\u2193]: [Enter]: Confirm",
+                default="9600",
+                choices=baud_rate_choices
+            ).execute()
+            args.baud_rate = baud_rate
+
         args.app = apps
         install_app(args)
     elif action == "Remove":
@@ -260,7 +284,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(
@@ -277,8 +301,9 @@ def interact():
 
 
 def main():
-    parser = argparse.ArgumentParser(description='''Does stuff like installing Aapps, installing Magisk, installing 
+    parser = argparse.ArgumentParser(description='''
-    NDK Translation, and getting Android ID for device registration. Use -h flag for help!''')
+    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="coomand", dest='command')
     parser.add_argument('-a', '--android-version',
@@ -307,10 +332,10 @@ def main():
 
     install_help = """
 gapps: Install Open GApps (Android 11) or MindTheGapps (Android 13)
-microg: Add microG, Aurora Store, and Aurora Droid to WayDroid
+microg: Add microG, Aurora Store and Aurora Droid to WayDriod
-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
@@ -330,7 +355,7 @@ widevine: Add support for widevine DRM L3
     remove_parser = subparsers.add_parser(
         'remove', aliases=["uninstall"], help='Remove an app')
     remove_parser.add_argument(
-        **arg_template, choices=[*remove_choices, *hack_choices], help='Name of app to remove')
+        **arg_template, choices=[*remove_choices, * hack_choices], help='Name of app to remove')
     remove_parser.set_defaults(func=remove_app)
 
     # hack and its aliases
@@ -341,6 +366,8 @@ widevine: Add support for widevine DRM L3
 
     args = parser.parse_args()
     args.microg_variant = "Standard"
+    args.gps_host = "/dev/ttyGPSD"
+    args.baud_rate = "9600"
     if hasattr(args, 'func'):
         args_dict = vars(args)
         helper.check_root()

stuff/android_id.py

@@ -4,7 +4,7 @@ from tools.logger import Logger
 
 
 class AndroidId:
-    def get_id(self):
+   def get_id(self):
         if container.is_running():
             try:
                 queryout = shell(

stuff/fdroidpriv.py

@@ -1,6 +1,5 @@
 import os
 import shutil
-
 from stuff.general import General
 
 
@@ -23,11 +22,10 @@ class FDroidPriv(General):
         "priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.apk"
     ]
     file_map = {
-        "permissions_org.fdroid.fdroid.privileged.xml": "etc/permissions/permissions_org.fdroid.fdroid.privileged.xml",
+      "permissions_org.fdroid.fdroid.privileged.xml": "etc/permissions/permissions_org.fdroid.fdroid.privileged.xml",
-        "F-Droid.apk": "app/F-Droid/F-Droid.apk",
+      "F-Droid.apk": "app/F-Droid/F-Droid.apk",
-        "F-DroidPrivilegedExtension.apk": "priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.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]
@@ -41,3 +39,4 @@ 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,6 +1,5 @@
 import os
 import shutil
-
 from stuff.general import General
 from tools.helper import run
 
@@ -10,32 +9,16 @@ class Gapps(General):
     partition = "system"
     dl_links = {
         "11": {
-            "x86_64": [
+            "x86_64": ["https://sourceforge.net/projects/opengapps/files/x86_64/20220503/open_gapps-x86_64-11.0-pico-20220503.zip", "5a6d242be34ad1acf92899c7732afa1b"],
-                "https://sourceforge.net/projects/opengapps/files/x86_64/20220503/open_gapps-x86_64-11.0-pico-20220503.zip",
+            "x86": ["https://sourceforge.net/projects/opengapps/files/x86/20220503/open_gapps-x86-11.0-pico-20220503.zip", "efda4943076016d00b40e0874b12ddd3"],
-                "5a6d242be34ad1acf92899c7732afa1b"],
+            "arm64-v8a": ["https://sourceforge.net/projects/opengapps/files/arm64/20220503/open_gapps-arm64-11.0-pico-20220503.zip", "7790055d34bbfc6fe610b0cd263a7add"],
-            "x86": [
+            "armeabi-v7a": ["https://sourceforge.net/projects/opengapps/files/arm/20220215/open_gapps-arm-11.0-pico-20220215.zip", "8719519fa32ae83a62621c6056d32814"]
-                "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": [
+            "x86_64": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86_64-20231028.zip", "63ccebbf93d45c384f58d7c40049d398"],
-                "https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86_64-20231028.zip",
+            "x86": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86-20231028.zip", "f12b6a8ed14eedbb4b5b3c932a865956"],
-                "63ccebbf93d45c384f58d7c40049d398"],
+            "arm64-v8a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm64-20231028.zip", "11180da0a5d9f2ed2863882c30a8d556"],
-            "x86": [
+            "armeabi-v7a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm-20231028.zip", "d525c980bac427844aa4cb01628f8a8f"]
-                "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 = ...
@@ -141,8 +124,7 @@ 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",
+                        lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
-                         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(
@@ -163,16 +145,14 @@ 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",
+                        lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
-                         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),
+                        shutil.copytree(os.path.join(self.extract_to, "appunpack", app_name, "common", ccdir), os.path.join(
-                                        os.path.join(
+                            self.copy_dir, self.partition, ccdir), dirs_exist_ok=True)
-                                            self.copy_dir, self.partition, ccdir), dirs_exist_ok=True)
 
     def copy_13(self):
         src_dir = os.path.join(self.extract_to, "system")
@@ -183,7 +163,7 @@ class Gapps(General):
             for file in files:
                 src_file_path = os.path.join(root, file)
                 dst_file_path = os.path.join(dst_dir, os.path.relpath(
-                    src_file_path, src_dir))
+                        src_file_path, src_dir))
                 if not os.path.exists(os.path.dirname(dst_file_path)):
                     os.makedirs(os.path.dirname(dst_file_path))
                 # Logger.info(f"{src_file_path} -> {dst_file_path}")

stuff/general.py

@@ -1,12 +1,11 @@
 import configparser
 import glob
-import hashlib
 import os
 import shutil
 import zipfile
-
+import hashlib
-from tools import container
 from tools.helper import download_file, get_download_dir, host
+from tools import container
 from tools.logger import Logger
 
 
@@ -75,7 +74,7 @@ class General:
             if not os.path.exists(bin_dir):
                 os.makedirs(bin_dir)
             shutil.copy(os.path.join(os.path.join(os.path.dirname(__file__), "..", "bin",
-                                                  self.arch[0], "resetprop")), bin_dir)
+                        self.arch[0], "resetprop")), bin_dir)
             os.chmod(os.path.join(bin_dir, "resetprop"), 0o755)
         if not os.path.isfile(os.path.join(bin_dir, "resetprop.sh")):
             with open(os.path.join(bin_dir, "resetprop.sh"), "w") as f:

stuff/gps.py

@@ -0,0 +1,197 @@
+import os
+from xml.dom import minidom
+import xml.etree.ElementTree as ET
+import shutil
+from stuff.general import General
+from tools.logger import Logger
+import tools.images as images
+from tools.helper import run, host 
+from tools import container
+
+class GPS(General):
+    id = "gps"
+    partition = "vendor"
+    dl_links = ["https://github.com/Lolmc0587/android_gps_libraries/archive/refs/tags/2.1.zip","f84c369c7cebd9dbb8987ca15c6aa856"]
+    act_md5 = ...
+    dl_link = ...
+    dl_file_name = "android_gps_libraries-2.1.zip"
+    extract_to = "/tmp/android_gps_libraries-2.1"
+
+    files = [
+        "lib/hw/android.hardware.gnss@1.0-impl.so",
+        "lib64/hw/android.hardware.gnss@1.0-impl.so",
+        "lib/hw/gps.default.so",
+        "lib64/hw/gps.default.so",
+        "etc/init/android.hardware.gnss@1.0-service.rc",
+    ]
+    
+
+    def __init__(self, android_version="11", gps_host="/dev/ttyGPSD", baud_rate=9600) -> None:
+        super().__init__()
+        self.host_arch = host()
+        # Set for arm 32 bit support from file downloaded 
+        self.host = "arm64-v8a" if "arm" in self.host_arch[0] else self.host_arch[0]
+        self.gps_host = gps_host
+        self.baud_rate = baud_rate
+        self.android_version = android_version
+        self.usb_name = self.gps_host.replace("/dev/", "")
+        self.files_vendor = [
+            "bin/hw/android.hardware.gnss@1.0-service",
+        ]
+        self.config_files = {
+            "11": [
+                "etc/vintf/compatibility_matrix.legacy.xml",
+                "etc/vintf/manifest.xml",
+                "build.prop",
+            ],
+            "13": [
+                "etc/vintf/compatibility_matrix.7.xml",
+                "etc/vintf/manifest.xml",
+                "build.prop",
+            ],
+        }
+    
+        self.compatibility_files = {
+            "11": "etc/vintf/compatibility_matrix.legacy.xml",
+            "13": "etc/vintf/compatibility_matrix.7.xml",
+        }
+
+        self.dl_link = self.dl_links[0]
+        self.act_md5 = self.dl_links[1]
+
+    def update_manifest(self, manifest_path, data):
+        """
+        Update the manifest file by inserting data into the <manifest> tag and format the XML.
+        """
+        tree = ET.parse(manifest_path)
+        root = tree.getroot()
+
+        root.append(ET.fromstring(data))
+        tree.write(manifest_path, encoding="utf-8", xml_declaration=True)
+
+        with open(manifest_path, "r") as f:
+            content = f.read()
+            formatted_content = minidom.parseString(content).toprettyxml(indent="    ")
+
+        formatted_content = "\n".join(
+            [line for line in formatted_content.split("\n") if line.strip()]
+        )
+
+        with open(manifest_path, "w") as f:
+            f.write(formatted_content)
+
+    def copy(self):
+        Logger.info("Copying gps library files ...")
+        if self.android_version == "11":
+            shutil.copytree(os.path.join(self.extract_to, self.dl_file_name.replace(".zip", ""), self.android_version,
+                        self.host, "system"), os.path.join(self.copy_dir, "system"), dirs_exist_ok=True)
+            self.partition = "system"
+        if self.android_version == "13":
+            shutil.copytree(os.path.join(self.extract_to, self.dl_file_name.replace(".zip", ""), self.android_version,
+                            self.host, "system"), os.path.join(self.copy_dir, "vendor"), dirs_exist_ok=True)
+            self.partition = "vendor"
+        shutil.copytree(os.path.join(self.extract_to, self.dl_file_name.replace(".zip", ""), self.android_version,
+                        self.host, "vendor"), os.path.join(self.copy_dir, "vendor"), dirs_exist_ok=True)
+        
+    def extra1(self):
+        Logger.info("Setting extra permissions ...")
+        # set permissions for vendor files
+        path = os.path.join(self.copy_dir, "vendor", self.files_vendor[0])
+        self.set_perm2(path, recursive=True)
+        
+        # Copy nessessary files to the overlayfs
+        container.stop()
+        copy_dir = "/tmp/waydroid"
+        if container.use_overlayfs():
+            img = os.path.join(images.get_image_dir(), "system.img")
+            # images.mount(img, copy_dir)
+            if not os.path.exists(copy_dir):
+                os.makedirs(copy_dir)
+            run(["sudo", "mount", img, copy_dir])
+
+            for file in self.config_files[self.android_version]:
+                file_dir = os.path.join(self.copy_dir, "system", file)
+                if not os.path.exists(os.path.dirname(file_dir)):
+                    os.makedirs(os.path.dirname(file_dir))
+                shutil.copyfile(os.path.join(copy_dir, "system", file), file_dir)
+                self.set_perm2(file_dir, recursive=True)
+
+            if self.android_version == "13":
+                # Copy missing libraries file for android 13 vendor partition from system partition
+                if not os.path.exists(os.path.join(self.copy_dir, "vendor", "lib64", "hw")):
+                    os.makedirs(os.path.join(self.copy_dir, "vendor", "lib64", "hw"))
+
+                copy_ = True
+                if "arm" in self.host and self.host_arch[1] == 32:
+                    copy_ = False
+                if copy_:
+                    shutil.copyfile(os.path.join(copy_dir, "system", "lib64/android.hardware.gnss@1.0.so"),
+                                    os.path.join(self.copy_dir, "vendor", "lib64/hw/android.hardware.gnss@1.0.so"))
+                
+                if not os.path.exists(os.path.join(self.copy_dir, "vendor", "lib", "hw")):
+                    os.makedirs(os.path.join(self.copy_dir, "vendor", "lib", "hw"))
+
+                shutil.copyfile(os.path.join(copy_dir, "system", "lib/android.hardware.gnss@1.0.so"),
+                                os.path.join(self.copy_dir, "vendor", "lib/hw/android.hardware.gnss@1.0.so"))
+                
+            images.umount(copy_dir)
+        
+        # Update manifest files
+        container.upgrade()
+        
+        manifest_entry_1 = """
+            <hal format="hidl" optional="true">
+                <name>android.hardware.gnss</name>
+                <version>1.0</version>
+                <interface>
+                    <name>IGnss</name>
+                    <instance>default</instance>
+                </interface>
+            </hal>
+        """
+        self.update_manifest(
+            os.path.join(self.copy_dir, "system", self.compatibility_files[self.android_version]),
+            data=manifest_entry_1,
+        )
+
+        manifest_entry_2 = """
+            <hal format="hidl">
+                <name>android.hardware.gnss</name>
+                <transport>hwbinder</transport>
+                <version>1.0</version>
+                <interface>
+                    <name>IGnss</name>
+                    <instance>default</instance>
+                </interface>
+                <fqname>@1.0::IGnss/default</fqname>
+            </hal>
+        """
+        self.update_manifest(os.path.join(self.copy_dir, "system", "etc", "vintf", "manifest.xml"), data=manifest_entry_2)
+        config_nodes = "/var/lib/waydroid/lxc/waydroid/config_nodes"
+        # lxc.mount.entry = /dev/ttyGPSD dev/ttyGPSD none bind,create=file,optional 0 0
+
+        with open(config_nodes, "a") as f:
+            f.write(f"lxc.mount.entry = {self.gps_host} dev/{self.usb_name} none bind,create=file,optional 0 0\n")
+
+        with open(os.path.join(self.copy_dir, "system", "build.prop"), "a") as f:
+            f.write("ro.factory.hasGPS=true\n")
+            f.write(f"ro.kernel.android.gps={self.usb_name}\n")
+            f.write(f"ro.kernel.android.gps.speed={self.baud_rate}\n")
+        Logger.warning(
+            "You need to add user to the 'dialout' group to access the GPS device."
+            "\nYou can do this by running: sudo usermod -aG dialout <your_username>"
+            "\nand then reboot your system."
+        )
+    def extra2(self):
+        # Remove vendor files from system partition
+        self.files = self.files_vendor
+        self.partition = "vendor"
+        self.remove()
+
+        # Remove config files from system partition
+        self.files = self.config_files[self.android_version]
+        self.partition = "system"
+        self.remove()
+
+        container.upgrade()
+        

stuff/hidestatusbar.py

@@ -1,6 +1,5 @@
 import os
 import shutil
-
 from stuff.general import General
 
 
@@ -13,9 +12,8 @@ class HideStatusBar(General):
     dl_link = ...
     act_md5 = ...
     files = [
-        "product/overlay/" + dl_file_name
+        "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,7 +1,6 @@
 import os
 import re
 import shutil
-
 from stuff.general import General
 from tools.logger import Logger
 
@@ -58,7 +57,7 @@ on property:ro.enable.native.bridge.exec=1
         Logger.info("Copying libhoudini library files ...")
         name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
         shutil.copytree(os.path.join(self.extract_to, "vendor_intel_proprietary_houdini-" + name,
-                                     "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
         init_path = os.path.join(
             self.copy_dir, self.partition, "etc", "init", "houdini.rc")
         if not os.path.isfile(init_path):

stuff/magisk.py

@@ -1,13 +1,11 @@
 import gzip
 import os
-import re
 import shutil
-
+import re
 from stuff.general import General
-from tools import container
+from tools.helper import download_file, get_data_dir, host
-from tools.helper import download_file, get_data_dir
 from tools.logger import Logger
-
+from tools import container
 
 class Magisk(General):
     id = "magisk delta"
@@ -85,9 +83,8 @@ on property:init.svc.zygote=stopped
                 filename = re.search('lib(.*)\.so', filename)
                 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.copyfile(self.download_loc, os.path.join(magisk_absolute_dir,"magisk.apk") )
-        shutil.copytree(os.path.join(self.extract_to, "assets", "chromeos"),
+        shutil.copytree(os.path.join(self.extract_to, "assets", "chromeos"), os.path.join(magisk_absolute_dir, "chromeos"), dirs_exist_ok=True)
-                        os.path.join(magisk_absolute_dir, "chromeos"), dirs_exist_ok=True)
         assets_files = [
             "addon.d.sh",
             "boot_patch.sh",
@@ -100,11 +97,11 @@ on property:init.svc.zygote=stopped
         # Updating Magisk from Magisk manager will modify bootanim.rc, 
         # So it is necessary to backup the original bootanim.rc.
         bootanim_path = os.path.join(self.copy_dir, self.partition, "etc", "init", "bootanim.rc")
-        gz_filename = os.path.join(bootanim_path) + ".gz"
+        gz_filename = os.path.join(bootanim_path)+".gz"
-        with gzip.open(gz_filename, 'wb') as f_gz:
+        with gzip.open(gz_filename,'wb') as f_gz:
             f_gz.write(self.oringinal_bootanim.encode('utf-8'))
         with open(bootanim_path, "w") as initfile:
-            initfile.write(self.oringinal_bootanim + self.bootanim_component)
+            initfile.write(self.oringinal_bootanim+self.bootanim_component)
 
     def set_path_perm(self, path):
         if "magisk" in path.split("/"):

stuff/microg.py

@@ -1,6 +1,5 @@
 import os
 import shutil
-
 from stuff.general import General
 from tools.logger import Logger
 
@@ -16,7 +15,7 @@ class MicroG(General):
         "org.microg.nlp.backend.ichnaea_20036.apk": "0b3cb65f8458d1a5802737c7392df903",
         "org.microg.nlp.backend.nominatim_20042.apk": "88e7397cbb9e5c71c8687d3681a23383",
     }
-    microg_apks = {
+    microg_apks= {
         "com.google.android.gms-223616054.apk": "a945481ca5d33a03bc0f9418263c3228",
         "com.google.android.gsf-8.apk": "b2b4ea3642df6158e14689a4b2a246d4",
         "com.android.vending-22.apk": "6815d191433ffcd8fa65923d5b0b0573",
@@ -108,7 +107,7 @@ service microg_service /system/bin/sh /system/bin/npem
         super().__init__()
         self.dl_link = self.dl_links[variant][0]
         self.act_md5 = self.dl_links[variant][1]
-        self.id = self.id + f"-{variant}"
+        self.id = self.id+f"-{variant}"
         self.dl_file_name = f'MinMicroG-{variant}.zip'
         if android_version == "11":
             self.sdk = 30
@@ -124,7 +123,7 @@ service microg_service /system/bin/sh /system/bin/npem
         else:
             sub_arch = "x86"
         if 64 == self.arch[1]:
-            arch = f"{sub_arch}{'' if sub_arch == 'arm' else '_'}64"
+            arch = f"{sub_arch}{'' if sub_arch=='arm' else '_'}64"
         for root, dirs, files in os.walk(src_dir):
             flag = False
             dir_name = os.path.basename(root)
@@ -136,8 +135,7 @@ 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(
+                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:
-                        self.sdk) not in sdks:
                     continue
                 else:
                     flag = True

stuff/mitm.py

@@ -1,16 +1,14 @@
 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"
 
-    def __init__(self, ca_cert_file: str = None) -> None:
+    def __init__(self, ca_cert_file: str=None) -> None:
         super().__init__()
         self.ca_cert_file = ca_cert_file
 

stuff/ndk.py

@@ -1,11 +1,9 @@
 import os
 import re
 import shutil
-
 from stuff.general import General
 from tools.logger import Logger
 
-
 class Ndk(General):
     id = "libndk"
     partition = "system"
@@ -28,19 +26,19 @@ class Ndk(General):
         "ro.dalvik.vm.isa.arm64": "x86_64"
     }
     files = [
-        "bin/arm",
+            "bin/arm",
-        "bin/arm64",
+            "bin/arm64",
-        "bin/ndk_translation_program_runner_binfmt_misc",
+            "bin/ndk_translation_program_runner_binfmt_misc",
-        "bin/ndk_translation_program_runner_binfmt_misc_arm64",
+            "bin/ndk_translation_program_runner_binfmt_misc_arm64",
-        "etc/binfmt_misc",
+            "etc/binfmt_misc",
-        "etc/ld.config.arm.txt",
+            "etc/ld.config.arm.txt",
-        "etc/ld.config.arm64.txt",
+            "etc/ld.config.arm64.txt",
-        "etc/init/ndk_translation.rc",
+            "etc/init/ndk_translation.rc",
-        "lib/arm",
+            "lib/arm",
-        "lib64/arm64",
+            "lib64/arm64",
-        "lib/libndk*",
+            "lib/libndk*",
-        "lib64/libndk*"
+            "lib64/libndk*"
-    ]
+        ]
 
     def __init__(self, android_version="11") -> None:
         super().__init__()

stuff/nodataperm.py

@@ -1,23 +1,22 @@
 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":
-            {
+        {
-                "x86_64": [
+            "x86_64": [
-                    "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
+                "https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
-                    "b0e3908ffcf5df8ea62f4929aa680f1a"
+                "b0e3908ffcf5df8ea62f4929aa680f1a"
-                ],
+            ],
-            },
+        },
         "13": {}
     }
     dl_file_name = "nodataperm.zip"

stuff/smartdock.py

@@ -1,16 +1,14 @@
 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"
     partition = "system"
     dl_file_name = "smartdock.apk"
     act_md5 = "f4087d34218eac902a5cca98ee03d215"
-    apply_props = {"qemu.hw.mainkeys": "1"}
+    apply_props = { "qemu.hw.mainkeys" : "1" }
     skip_extract = True
     permissions = """<?xml version="1.0" encoding="utf-8"?>
 <permissions>
@@ -36,10 +34,10 @@ class Smartdock(General):
 </permissions>
     """
     files = [
-        "etc/permissions/permissions_cu.axel.smartdock.xml",
+            "etc/permissions/permissions_cu.axel.smartdock.xml",
-        "priv-app/SmartDock",
+            "priv-app/SmartDock",
-        "etc/init/smartdock.rc"
+            "etc/init/smartdock.rc"
-    ]
+        ]
     rc_content = '''
 on property:sys.boot_completed=1
     start set_home_activity
@@ -58,9 +56,7 @@ 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(
+        with open(os.path.join(self.copy_dir, self.partition, "etc", "permissions", "permissions_cu.axel.smartdock.xml"), "w") as f:
-                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,7 +1,6 @@
 import os
 import re
 import shutil
-
 from stuff.general import General
 from tools.logger import Logger
 
@@ -19,9 +18,8 @@ class Widevine(General):
         },
         # "armeabi-v7a": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "fed6898b5cfd2a908cb134df97802554"],
         "arm64-v8a": {
-            "11": [
+            "11": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip",
-                "https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip",
+                   "fed6898b5cfd2a908cb134df97802554"]
-                "fed6898b5cfd2a908cb134df97802554"]
         }
     }
     dl_file_name = "widevine.zip"

tools/container.py

@@ -1,12 +1,10 @@
 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)
 
@@ -31,7 +29,7 @@ def use_overlayfs():
         Logger.error("Required entry in config was not found, Cannot continue!")
     if "mount_overlays" not in cfg["waydroid"]:
         return False
-    if cfg["waydroid"]["mount_overlays"] == "True":
+    if cfg["waydroid"]["mount_overlays"]=="True":
         return True
     return False
 
@@ -45,12 +43,11 @@ def stop():
     #     if session:
     #         DBusContainerService().Stop(False)
     # else:
-    run(["waydroid", "container", "stop"])
+        run(["waydroid", "container", "stop"])
 
 
 def is_running():
-    return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
+        return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
-
 
 def upgrade():
     run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")

tools/helper.py

@@ -1,16 +1,15 @@
 import gzip
-import hashlib
 import os
+import re
 import platform
 import re
 import subprocess
 import sys
-from typing import Optional
-
 import requests
-from tqdm import tqdm
-
 from tools.logger import Logger
+from tqdm import tqdm
+import hashlib
+from typing import Optional
 
 
 def get_download_dir():
@@ -18,7 +17,7 @@ def get_download_dir():
     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"
@@ -27,12 +26,9 @@ def get_download_dir():
         os.makedirs(download_loc)
     return download_loc
 
-
 # not good
 def get_data_dir():
-    return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid",
+    return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid", "data")
-                        "data")
-
 
 # execute on host
 def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
@@ -56,7 +52,6 @@ def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
         )
     return result
 
-
 # execute on waydroid shell
 def shell(arg: str, env: Optional[str] = None):
     a = subprocess.Popen(
@@ -66,8 +61,7 @@ def shell(arg: str, env: Optional[str] = None):
         stderr=subprocess.PIPE
     )
     subprocess.Popen(
-        args=["echo",
+        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"],
-              "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()
@@ -95,7 +89,6 @@ def shell(arg: str, env: Optional[str] = None):
         )
     return a.stdout.read().decode("utf-8")
 
-
 def download_file(url, f_name):
     md5 = ""
     response = requests.get(url, stream=True)
@@ -114,7 +107,6 @@ def download_file(url, f_name):
         raise ValueError("Something went wrong while downloading")
     return md5
 
-
 def host():
     machine = platform.machine()
 
@@ -133,7 +125,7 @@ def host():
                     return ("x86", 32)
         return mapping[machine]
     raise ValueError("platform.machine '" + machine + "'"
-                                                      " architecture is not supported")
+                     " architecture is not supported")
 
 
 def check_root():
@@ -141,16 +133,14 @@ def check_root():
         Logger.error("This script must be run as root. Aborting.")
         sys.exit(1)
 
-
 def backup(path):
-    gz_filename = path + ".gz"
+    gz_filename = path+".gz"
     with gzip.open(gz_filename, 'wb') as f_gz:
         with open(path, "rb") as f:
             f_gz.write(f.read())
 
-
 def restore(path):
-    gz_filename = path + ".gz"
+    gz_filename = path+".gz"
     with gzip.GzipFile(gz_filename) as f_gz:
         with open(path, "wb") as f:
             f.writelines(f_gz)

tools/images.py

@@ -1,18 +1,16 @@
 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:
@@ -25,12 +23,10 @@ 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()
@@ -40,6 +36,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!")  # magisk
+        Logger.error("Required entry in config was not found, Cannot continue!") #magisk
         sys.exit(1)
     return cfg["waydroid"]["images_path"]

tools/logger.py

@@ -2,12 +2,12 @@ class Logger:
 
     @staticmethod
     def error(str):
-        print("\033[31m" + "ERROR: " + str + "\033[0m")
+        print("\033[31m"+"ERROR: "+str+"\033[0m")
 
     @staticmethod
     def info(str):
-        print("\033[32m" + "INFO: " + "\033[0m" + str)
+        print("\033[32m"+"INFO: "+"\033[0m"+str)
 
     @staticmethod
     def warning(str):
-        print("\033[33m" + "WARN: " + str + "\033[0m")
+        print("\033[33m"+"WARN: "+str+"\033[0m")