Merge pull request #13 from ItsLogic/main

More detailed written instructions

Author: ADeltaX

README.md

@@ -5,46 +5,93 @@
 # As a temporary measure I made a tutorial
 [![How to install Google Apps (Play Store) on WSA (Windows Subsystem Android)](http://img.youtube.com/vi/rIt00xDp0tM/0.jpg)](http://www.youtube.com/watch?v=rIt00xDp0tM "How to install Google Apps (Play Store) on WSA (Windows Subsystem Android)")
 
-## SIGN IN DOESN'T WORK CURRENTLY. 
+## SIGN IN DOESN'T WORK CURRENTLY. (Unless you use the fix at the bottom)
 ### THIS IS FOR TESTING
 
-Download MSIXBUNDLE (use store rg-adguard to download the msixbundle, Package id: 9P3395VX91NR, Ring: SLOW, size is around 1.2GB)
-
-INSTALL WSL2 (ubuntu/debian, any other distro could work)
-
-INSTALL unzip lzip 
-
-DOWNLOAD GAPPS PICO FROM OPENGAPPS (x86_64, 11, PICO)
-
-EXTRACT MSIXBUNDLE, EXTRACT MSIX (YOUR ARCH) TO A FOLDER, DELETE (APPXMETADATA, APPXBLOCKMAP, APPXSIGNATURE, \[CONTENT_TYPES\])
-
-COPY IMAGES (SYSTEM.IMG, SYSTEM_EXT.IMG, PRODUCT.IMG, VENDOR.IMG) TO #IMAGES
-
-COPY (GAPPS PICO ZIP) TO #GAPPS
-
-EDIT (VARIABLES.sh) AND SET ROOT FOLDER
-
-EXECUTE AS SUDO:
-- extract_gapps_pico.sh
-- extend_and_mount_images.sh
-- apply.sh
-- unmount_images.sh
-
-COPY IMAGES FROM (#IMAGES FOLDER) TO YOUR EXTRACTED MSIX FOLDER
-
-OPEN POWERSHELL (NOT CORE) AS ADMIN, EXECUTE (Add-AppxPackage -Register PATH_TO_EXTRACTED_MSIX\AppxManifest.xml)
-DEVELOPMENT MODE HAS TO BE ENABLED BEFOREHAND. MAKE SURE YOU DON'T HAVE WSA ALREADY INSTALLED, THEY CAN'T COEXIST.
-
-RUN WSA WITH GAPPS, ENJOY
+### Download msixbundle (~1.2GB)
+Use this [link](https://store.rg-adguard.net/) to download the msixbundle with the settings ProductId: 9P3395VX91NR, Ring: SLOW
+
+### Install WSL2 
+Ubuntu is used in this guide but any other distro will work for this 
+
+(We are assuming that you are using the exact terminal, and you are also continuing this from where the last command left off)
+
+### Install unzip lzip 
+For Ubuntu
+```
+sudo apt-get update
+sudo apt install unzip lzip
+```
+
+### Download gapps 
+Select Platform: x86_64 if Windows architecture is x64 otherwise choose ARM64, Android: 11 and Variant: Pico on [OpenGApps](https://opengapps.org/)
+
+### Extract msixbundle
+Download 7zip or a similar archival program and open the recently downloaded msixbundle. Find the msix file inside the msixbundle relating to your architecture and extract that to a folder.
+Delete the files appxblockmap, appxsignature and \[content_types\] along with the folder appxmetadata
+
+### Clone this repo and populate the directories
+For Ubuntu
+```
+git clone https://github.com/ADeltaX/WSAGAScript
+cd WSAGAScript/\#IMAGES
+mv /mnt/path-to-extracted-msix/*.img .
+cd ../\#GAPPS
+cp /mnt/path-to-downloaded-gapps/*.zip .
+```
+paths in wsl follow the same as windows after /mnt/ its just the drive letter then folder structure as normal. For example /mnt/c/users would be the c:\users folder
+
+
+### Edit scripts
+Set executable permission for the scripts
+```
+cd..
+sudo chmod +x extract_gapps_pico.sh
+sudo chmod +x extend_and_mount_images.sh
+sudo chmod +x apply.sh
+sudo chmod +x unmount_images.sh
+```
+Change the root directory in VARIABLES.sh
+```
+pwd
+```
+(take note of the output)
+```
+nano VARIABLES.sh
+```
+
+replace the root variable with the output of pwd up until and including the WSAGAScript folder 
+
+
+### Run the scripts
+```
+sudo ./extract_gapps_pico.sh
+sudo ./extend_and_mount_images.sh
+sudo ./apply.sh
+sudo ./unmount_images.sh
+```
+
+### Copy the edited images
+```
+cd \#IMAGES
+cp *.img /mnt/path-to-extracted-msix/
+```
+### Register the edited WSA
+Enable developer mode in windows settings
+Uninstall any other installed versions of WSA
+Open powershell as admin and run ```Add-AppxPackage -Register path-to-extracted-msix\AppxManifest.xml```
+
+WSA will install with gapps
 
 # WORKAROUND FOR SIGN IN ISSUE:
 ## (ADB SHELL ROOT WITH su)
+Copy the kernel file from this repo and replace the kernel file inside the Tools folder of your extracted msix (make sure WSA is not running)
 
-COPY (kernel FILE) FROM (misc FOLDER) TO (Tools FOLDER) IN YOUR EXTRACTED MSIX FOLDER
-
-NOW YOU CAN USE su IN ADB SHELL
-ENTER ADB SHELL, TYPE su THEN TYPE setenforce 0
-YOU CAN NOW SIGN IN
-
+This will allow you use use su inside adb shell
 
-This readme will be rewritten very soon
+Enter adb shell and run
+```
+su
+setenforce 0
+```
+You can now sign in