From b84eb4063fd9744adee31c049a20e15371fac432 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Sat, 28 Jan 2023 19:16:08 +0800 Subject: [PATCH 1/2] Update README.md Close #370 --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 55fb93c..1e1925a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,12 @@ - Linux (x86_64 or arm64) - The following dependencies are required: `setools lzip wine patchelf e2fsprogs aria2 python3 attr` + The following dependencies are required: + + | DistrOS | | | | | + |:-------:|-------------------------------------------------------------------------------------------------|-------------------|------------|-----------| + | Debian | `lzip wine winetricks patchelf e2fsprogs aria2 python3 python3-pip aria2 p7zip-full attr unzip` | `setools` | `whiptail` | `xz-util` | + | SuSE | Same as above | `setools-console` | `dialog` | `xz` | The following components need to be installed using `winetricks`: `msxml6` From 312cc188e07b4c9c1898b3d5f93a4370657e60b9 Mon Sep 17 00:00:00 2001 From: Howard20181 <40033067+Howard20181@users.noreply.github.com> Date: Sun, 29 Jan 2023 03:47:34 +0800 Subject: [PATCH 2/2] Add an alert that OpenGApps will fail to start Close #371 --- README.md | 4 ++++ scripts/build.sh | 6 ++++-- scripts/run.sh | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1e1925a..37cf043 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,10 @@ No. You should wipe data after changing the GApps brand. Otherwise, you will find that the installed GApps are not recognized. +- WSA with OpenGApps integrated fails to start. + + OpenGApps has not yet released a version built for Android 12L and 13, only built for Android 11, which may not be compatible and thus cause crashes. Consider switching to MindTheGapps. + ## Credits - [StoreLib](https://github.com/StoreDev/StoreLib): API for downloading WSA diff --git a/scripts/build.sh b/scripts/build.sh index f370a97..0d8a3a9 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -779,8 +779,10 @@ else else name2="-$GAPPS_BRAND-${ANDROID_API_MAP[$ANDROID_API]}" fi - if [ "$GAPPS_BRAND" = "OpenGApps" ] && [ "$DEBUG" ]; then - echo ":warning: Since OpenGApps doesn't officially support Android 12.1 yet, lock the variant to pico!" + if [ "$GAPPS_BRAND" = "OpenGApps" ]; then + echo -e "\033[0;31m:warning: Since $GAPPS_BRAND doesn't officially support Android 12.1 and 13 yet, lock the variant to pico! + $GAPPS_BRAND may cause startup failure + \033[0m" fi fi artifact_name="WSA_${WSA_VER}_${ARCH}_${WSA_REL}${name1}${name2}" diff --git a/scripts/run.sh b/scripts/run.sh index 96c4e8f..d6ef0ad 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -82,8 +82,8 @@ if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")') Radiolist '([title]="Which GApps do you want to install?" [default]="MindTheGapps")' \ \ - 'OpenGApps' "" 'off' \ - 'MindTheGapps' "" 'on' + 'OpenGApps' "This flavor may cause startup failure" 'off' \ + 'MindTheGapps' "Recommend" 'on' ) else GAPPS_BRAND="none"