update: README.md

README.md

@@ -2,22 +2,13 @@
 Script to add gapps and other stuff to waydroid !
 
 # Installation/Usage
-"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
 
 ```
-git clone https://github.com/casualsnek/waydroid_script
+git clone https://github.com/ayasa520/waydroid_script
 cd waydroid_script
+sudo python3 -m pip install -r 
 sudo python main.py
 ```
 
@@ -31,16 +22,30 @@ sudo python main.py
 
 ## Command Line
 
-    git clone https://github.com/casualsnek/waydroid_script
+    git clone https://github.com/ayasa520/waydroid_script
     cd waydroid_script
     sudo python3 -m pip install -r requirements.txt
     # install something
     sudo python3 main.py install {gapps, magisk, libndk, libhoudini, nodataperm, smartdock, microg}
     # uninstall something
     sudo python3 main.py uninstall {gapps, magisk, libndk, libhoudini, nodataperm, smartdock, microg}
+    # get Android device ID
+    sudo python main.py certified
     # some hacks
     sudo python3 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)
@@ -125,7 +130,7 @@ Arknights, PUNISHING: GRAY RAVEN and other games won't freeze on the black scree
 Open terminal and switch to directory where "main.py" is located then run:
 
 ```
-sudo python3 main.py install nodataperm
+sudo 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 python3 main.py uninstall nodataperm` to remove it.
 
@@ -160,7 +165,7 @@ After
 ![After](assets/9.png)
 
 ```
-sudo python3 main.py install hidestatusbar
+sudo python3 main.py hack hidestatusbar
 ```
 
 

main.py

@@ -5,17 +5,17 @@ from InquirerPy.separator import Separator
 import argparse
 import os
 from typing import List
-from stuffs.android_id import AndroidId
-from stuffs.gapps import Gapps
-from stuffs.general import General
-from stuffs.hidestatusbar import HideStatusBar
-from stuffs.houdini import Houdini
-from stuffs.magisk import Magisk
-from stuffs.microg import MicroG
-from stuffs.ndk import Ndk
-from stuffs.nodataperm import Nodataperm
-from stuffs.smartdock import Smartdock
-from stuffs.widevine import Widevine
+from stuff.android_id import AndroidId
+from stuff.gapps import Gapps
+from stuff.general import General
+from stuff.hidestatusbar import HideStatusBar
+from stuff.houdini import Houdini
+from stuff.magisk import Magisk
+from stuff.microg import MicroG
+from stuff.ndk import Ndk
+from stuff.nodataperm import Nodataperm
+from stuff.smartdock import Smartdock
+from stuff.widevine import Widevine
 import tools.helper as helper
 from tools import container
 from tools import images
@@ -211,7 +211,9 @@ def interact():
             "Install",
             "Remove",
             "Hack",
+            "Get Google Device ID to Get Certified"
         ],
+        instruction="([↑↓]: Select Item)",
         default=None,
     ).execute()
     if not action:
@@ -222,7 +224,7 @@ def interact():
     if action == "Install":
         apps = inquirer.checkbox(
             message="Select apps",
-            instruction="([\u2191\u2193]: Select Item. [Space]: toggle choice), [Enter]: Confirm",
+            instruction="([\u2191\u2193]: Select Item. [Space]: Toggle Choice), [Enter]: Confirm",
             validate=lambda result: len(result) >= 1,
             invalid_message="should be at least 1 selection",
             choices=install_choices
@@ -241,7 +243,7 @@ def interact():
     elif action == "Remove":
         apps = inquirer.checkbox(
             message="Select apps",
-            instruction="([\u2191\u2193]: Select Item. [Space]: toggle choice), [Enter]: Confirm",
+            instruction="([\u2191\u2193]: Select Item. [Space]: Toggle Choice), [Enter]: Confirm",
             validate=lambda result: len(result) >= 1,
             invalid_message="should be at least 1 selection",
             choices=[*install_choices, *hack_choices]
@@ -252,13 +254,15 @@ def interact():
     elif action == "Hack":
         apps = inquirer.checkbox(
             message="Select hack options",
-            instruction="([\u2191\u2193]: Select Item. [Space]: toggle choice), [Enter]: Confirm",
+            instruction="([\u2191\u2193]: Select Item. [Space]: Toggle Choice), [Enter]: Confirm",
             validate=lambda result: len(result) >= 1,
             invalid_message="should be at least 1 selection",
             choices=hack_choices
         ).execute()
         args.option_name = apps
         hack_option(args)
+    elif action == "Get Google Device ID to Get Certified":
+        AndroidId().get_id()
 
 
 def main():

stuff/gapps.py

@@ -1,6 +1,6 @@
 import os
 import shutil
-from stuffs.general import General
+from stuff.general import General
 from tools.helper import run
 
 

stuff/hidestatusbar.py

@@ -1,6 +1,6 @@
 import os
 import shutil
-from stuffs.general import General
+from stuff.general import General
 
 
 class HideStatusBar(General):

stuff/houdini.py

@@ -1,7 +1,7 @@
 import os
 import re
 import shutil
-from stuffs.general import General
+from stuff.general import General
 from tools.logger import Logger
 
 

stuff/magisk.py

@@ -2,7 +2,7 @@ import gzip
 import os
 import shutil
 import re
-from stuffs.general import General
+from stuff.general import General
 from tools.helper import download_file, get_data_dir, host
 from tools.logger import Logger
 from tools import container

stuff/microg.py

@@ -1,6 +1,6 @@
 import os
 import shutil
-from stuffs.general import General
+from stuff.general import General
 from tools.logger import Logger
 
 

stuff/ndk.py

@@ -1,6 +1,6 @@
 import os
 import shutil
-from stuffs.general import General
+from stuff.general import General
 from tools.logger import Logger
 
 class Ndk(General):

stuff/nodataperm.py

@@ -1,7 +1,7 @@
 import gzip
 import os
 import shutil
-from stuffs.general import General
+from stuff.general import General
 from tools.logger import Logger
 from tools import container
 

stuff/smartdock.py

@@ -1,6 +1,6 @@
 import os
 import shutil
-from stuffs.general import General
+from stuff.general import General
 
 class Smartdock(General):
     id = "smartdock"

stuff/widevine.py

@@ -1,7 +1,7 @@
 import os
 import re
 import shutil
-from stuffs.general import General
+from stuff.general import General
 from tools.logger import Logger