Don't allow install gapps and kernelsu at the same time

close#783
LSPosed · Mar 5, 2024 · bc81b40 · bc81b40
1 parent 8cee064
commit bc81b40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -300,6 +300,10 @@ if [ "$DEBUG" ]; then
     set -x
 fi
 
+if [ "$HAS_GAPPS" ] && [ "$ROOT_SOL" = "kernelsu" ]; then
+    abort "Unsupported combination: Install GApps and KernelSU"
+fi
+
 # shellcheck disable=SC1091
 [ -f "$PYTHON_VENV_DIR/bin/activate" ] && {
     source "$PYTHON_VENV_DIR/bin/activate" || abort "Failed to activate virtual environment, please re-run install_deps.sh"

diff --git a/scripts/run.sh b/scripts/run.sh
@@ -98,10 +98,9 @@ if [ "$ROOT_SOL" = "magisk" ]; then
             'debug' "Canary Channel Debug Build" 'off'
     )
     COMMAND_LINE+=(--magisk-ver "$MAGISK_VER")
-fi
-
-if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")'); then
-    COMMAND_LINE+=(--install-gapps)
+    if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")'); then
+        COMMAND_LINE+=(--install-gapps)
+    fi
 fi
 
 if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to remove Amazon Appstore?")' no); then