From 50a8e3b4e9003ee1903390204647bb42abac30ce Mon Sep 17 00:00:00 2001 From: LoveSy Date: Sun, 12 Dec 2021 05:50:28 +0800 Subject: [PATCH] Fix GSI packages arch --- .github/workflows/magisk.yml | 8 ++++---- README.md | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/magisk.yml b/.github/workflows/magisk.yml index c23765f..80fbd71 100644 --- a/.github/workflows/magisk.yml +++ b/.github/workflows/magisk.yml @@ -72,7 +72,7 @@ jobs: rell = str(rel[0]) with open(os.environ['GITHUB_ENV'], 'a') as g: g.write(f'WSA_REL={rell}\n') - if 'language' in f.filename.lower(): + if 'language' in f.filename.lower() or 'scale' in f.filename.lower(): name = f.filename.split("-", 1)[1].split(".")[0] zip.extract(f) with zipfile.ZipFile(f.filename) as l: @@ -80,7 +80,7 @@ jobs: if g.filename == 'resources.pri': g.filename = f'{name}.pri' l.extract(g, 'pri') - print(f"extract language pack {g.filename}") + print(f"extract resource pack {g.filename}") elif g.filename == 'AppxManifest.xml': g.filename = f'{name}.xml' l.extract(g, 'xml') @@ -277,14 +277,14 @@ jobs: sed -i -zE "s//\n$(cat xml/* | grep -Po ']*/>' | sed ':a;N;$!ba;s/\n/\\n/g' | sed 's/\$/\\$/g' | sed 's/\//\\\//g')\n<\/Resources>/g" ${{ matrix.arch }}/AppxManifest.xml - name: Fix External Storage run: | - wget -qO- "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/archive/$GITHUB_REF.tar.gz" | sudo tar --wildcards -zxvf- --strip-component=2 '*/x64/system/*' + wget -qO- "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/archive/$GITHUB_REF.tar.gz" | sudo tar --wildcards -zxvf- --strip-component=2 '*/${{ matrix.arch }}/system/*' sudo find system/system/priv-app -type d -exec chmod 0755 {} \; sudo find system/system/priv-app -type f -exec chmod 0644 {} \; sudo find system/system/priv-app -type d -exec chcon --reference=system/system/priv-app {} \; - name: Integrate GApps if: ${{ github.event.inputs.gapps_variant != 'none' && github.event.inputs.gapps_variant != '' }} run: | - wget -qO- "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/archive/$GITHUB_REF.tar.gz" | sudo tar --wildcards -zxvf- --strip-component=2 '*/x64/gapps/*' + wget -qO- "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/archive/$GITHUB_REF.tar.gz" | sudo tar --wildcards -zxvf- --strip-component=2 '*/${{ matrix.arch }}/gapps/*' shopt -s extglob sudo cp -vr gapps/!(product) system/system sudo cp -vr gapps/product/* system/product/ diff --git a/README.md b/README.md index ee42515..8bdbe5a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ 1. Star (if you like) and fork this repo 1. Go to the **Action** tab in your forked repo ![Action Tab](https://docs.github.com/assets/images/help/repository/actions-tab.png) -1. In the left sidebar, click the **Magisk** workflow. +1. In the left sidebar, click the **Build WSA** workflow. ![Workflow](https://docs.github.com/assets/images/actions-select-workflow.png) 1. Above the list of workflow runs, select **Run workflow** ![Run Workflow](https://docs.github.com/assets/images/actions-workflow-dispatch.png) @@ -26,14 +26,11 @@ 1. Wait for the action to complete and download the artifact ![Download](https://docs.github.com/assets/images/help/repository/artifact-drop-down-updated.png) 1. Unzip the artifact - - 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.) + - The size shown in the webpage is uncompressed size and the zip you download will be compressed. So the size of the zip will be much less than the size shown in the webpage. 1. Right-click `Install.ps1` and select `Run with PowerShell` - If you previously have a MagiskOnWSA installation, it will automatically uninstall the previous while **preserving all userdata** and install the new one, so don't worry about your data. -1. Enjoy by installing LSPosed-zygisk with zygisk enabled or Riru and LSPosed-riru - -## Video Demo - -[demo](https://user-images.githubusercontent.com/5022927/139580565-35971031-7258-40bf-93e2-49a0750156f3.mp4) + - 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.) +1. Magisk/Play store will be launched. Enjoy by installing LSPosed-zygisk with zygisk enabled or Riru and LSPosed-riru ## Credits - [Magisk](https://github.com/topjohnwu/Magisk): The most famous root solution on Android