From 7b1fe8a5462dd0486118c2d613f4374db0f8ae2f Mon Sep 17 00:00:00 2001 From: Roshanlal Date: Sat, 1 Oct 2022 21:37:42 +0530 Subject: [PATCH 1/6] Update README.md (#158) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ce25e91..93eb22c 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,9 @@ There is no other variant we can choose. 1. Select the root solution (none means no root) -1. Wait for the script to complete and the artifact will be in the `output` folder -1. Move the artifact to a place you like -1. Double-click `Run.bat` +1. If you are running the script for the first time, it will take some time to complete. After the script completes, two new folders named `output` and `download` will be generated in the `MagiskOnWSALocal` folder. Go to the `output` folder. While running the ./run.sh script in the last step, if you selected `Yes` for `Do you want to compress the output?` then in `output` folder you will see a compressed file called `WSA-with-magisk-stable-MindTheGapps_2207.40000.8.0_x64_Release-Nightly`or else there will be folder with the `WSA-with-magisk-stable-MindTheGapps_2207.40000.8.0_x64_Release-Nightly`. If there is a folder open it and skip to step 10. NOTE: The name of compressed file or the folder generated in the `output` folder may be different for you. It will be dependent on the choices made when executing `./run.sh` +1. Extract the compressed file and open the folder created after the extraction of the file. +1. Here look for file `Run.bat` and run it. - If you previously have a MagiskOnWSA installation, it will automatically uninstall the previous one while **preserving all user data** and install the new one, so don't worry about your data. - If you have an official WSA installation, you should uninstall it first. (In case you want to preserve your data, you can backup `%LOCALAPPDATA%\Packages\MicrosoftCorporationII.WindowsSubsystemForAndroid_8wekyb3d8bbwe\LocalCache\userdata.vhdx` before uninstallation and restore it after installation.) (If you want to restore the icons to the start menu, please install and use [WSAHelper](https://github.com/LSPosed/WSAHelper/releases/latest).) - If the popup windows disappear **without asking administrative permission** and WSA is not installed successfully, you should manually run `Install.ps1` as administrator: From f019514acad79c4deb4a82bb25d80c7789682261 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:50:25 +0800 Subject: [PATCH 2/6] Update issue_moderator.yml --- .github/workflows/issue_moderator.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index 4dda6d2..fb6a74a 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -10,13 +10,6 @@ jobs: autoclose: runs-on: ubuntu-latest steps: - - name: Delete workflow runs - uses: Mattraks/delete-workflow-runs@v2 - with: - token: ${{ github.token }} - repository: ${{ github.repository }} - retain_days: 0 - keep_minimum_runs: 0 - name: Check issue uses: tachiyomiorg/issue-moderator-action@v1 with: From 9672e2cfb2425c2bc47287d5027f9ee4e2e0f405 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Sun, 2 Oct 2022 19:05:08 +0800 Subject: [PATCH 3/6] Update installation script Make sure to run Powershell using the Windows console host --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 79b50d7..90aa0d7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -691,7 +691,7 @@ function Finish { If (-Not (Test-Administrator)) { Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Bypass -Force - \$proc = Start-Process -PassThru -WindowStyle Hidden -Verb RunAs powershell.exe -Args "-ExecutionPolicy Bypass -Command Set-Location '\$PSScriptRoot'; &'\$PSCommandPath' EVAL" + \$proc = Start-Process -PassThru -WindowStyle Hidden -Verb RunAs ConHost.exe -Args "powershell -ExecutionPolicy Bypass -Command Set-Location '\$PSScriptRoot'; &'\$PSCommandPath' EVAL" \$proc.WaitForExit() If (\$proc.ExitCode -Ne 0) { Clear-Host From d072fca386756e008f5947fd9a86a1f0dbe730cf Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sun, 2 Oct 2022 20:31:42 +0900 Subject: [PATCH 4/6] Fix Improved method of adding features (#162) Co-authored-by: Howard Wu <40033067+Howard20181@users.noreply.github.com> --- .../android.software.device_admin.xml | 19 ------------------- scripts/build.sh | 7 ++++--- .../android.software.device_admin.xml | 19 ------------------- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 arm64/system/system/etc/permissions/android.software.device_admin.xml delete mode 100644 x64/system/system/etc/permissions/android.software.device_admin.xml diff --git a/arm64/system/system/etc/permissions/android.software.device_admin.xml b/arm64/system/system/etc/permissions/android.software.device_admin.xml deleted file mode 100644 index 7d14dc6..0000000 --- a/arm64/system/system/etc/permissions/android.software.device_admin.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/scripts/build.sh b/scripts/build.sh index 90aa0d7..84a6180 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -472,6 +472,10 @@ if [ "$REMOVE_AMAZON" ]; then echo -e "done\n" fi +echo "Add device administration features" +$SUDO sed -i -e '/cts/a \ \ \ \ ' -e '/print/i \ \ \ \ ' "$MOUNT_DIR"/vendor/etc/permissions/windows.permissions.xml +echo -e "done\n" + if [ "$ROOT_SOL" = 'magisk' ] || [ "$ROOT_SOL" = '' ]; then echo "Integrate Magisk" $SUDO mkdir "$MOUNT_DIR"/sbin @@ -582,9 +586,6 @@ find ../"$ARCH"/system/system/priv-app/ -maxdepth 1 -mindepth 1 -printf '%P\n' | find ../"$ARCH"/system/system/priv-app/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I placeholder $SUDO find "$MOUNT_DIR"/system/priv-app/placeholder -type f -exec chmod 0644 {} \; find ../"$ARCH"/system/system/priv-app/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I placeholder $SUDO find "$MOUNT_DIR"/system/priv-app/placeholder -exec chown root:root {} \; find ../"$ARCH"/system/system/priv-app/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I placeholder $SUDO find "$MOUNT_DIR"/system/priv-app/placeholder -exec setfattr -n security.selinux -v "u:object_r:system_file:s0" {} \; || abort -find ../"$ARCH"/system/system/etc/permissions/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I placeholder $SUDO find "$MOUNT_DIR"/system/etc/permissions/placeholder -type f -exec chmod 0644 {} \; -find ../"$ARCH"/system/system/etc/permissions/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I placeholder $SUDO find "$MOUNT_DIR"/system/etc/permissions/placeholder -exec chown root:root {} \; -find ../"$ARCH"/system/system/etc/permissions/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I placeholder $SUDO find "$MOUNT_DIR"/system/etc/permissions/placeholder -type f -exec setfattr -n security.selinux -v "u:object_r:system_file:s0" {} \; || abort echo -e "Add extra packages done\n" if [ "$GAPPS_BRAND" != 'none' ]; then diff --git a/x64/system/system/etc/permissions/android.software.device_admin.xml b/x64/system/system/etc/permissions/android.software.device_admin.xml deleted file mode 100644 index 7d14dc6..0000000 --- a/x64/system/system/etc/permissions/android.software.device_admin.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - From db46b5eb1d42d710f017c1c23755a2b77c2e2560 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Sun, 2 Oct 2022 19:40:49 +0800 Subject: [PATCH 5/6] Fix config SELinux label --- scripts/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build.sh b/scripts/build.sh index 84a6180..c283fb0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -474,6 +474,7 @@ fi echo "Add device administration features" $SUDO sed -i -e '/cts/a \ \ \ \ ' -e '/print/i \ \ \ \ ' "$MOUNT_DIR"/vendor/etc/permissions/windows.permissions.xml +$SUDO setfattr -n security.selinux -v "u:object_r:vendor_configs_file:s0" "$MOUNT_DIR"/vendor/etc/permissions/windows.permissions.xml || abort echo -e "done\n" if [ "$ROOT_SOL" = 'magisk' ] || [ "$ROOT_SOL" = '' ]; then From 2f59f6d32714f12e3aeb310b47cf0a85d1156908 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sun, 2 Oct 2022 22:42:19 +0900 Subject: [PATCH 6/6] Fix d072fca (#163) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93eb22c..4c5ffa6 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ - Support all OpenGApps variants except for aroma (aroma does not support x86_64, please use super instead) - Remove Amazon Appstore - Fix VPN dialog not showing (use our [VpnDialogs app](https://github.com/LSPosed/VpnDialogs)) -- Add device management feature +- Add device administration feature - Unattended installation - Automatically activates developers mode in Windows 11 - Update to the new version while preserving data with a one-click script