august/MagiskOnWSALocal
1
0
Fork 0
mirror of https://github.com/LSPosed/MagiskOnWSALocal.git synced 2025-05-06 14:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Close #783
This commit is contained in:
Howard Wu 2024-03-06 05:07:50 +08:00
parent 8cee0641e7
commit 8c71c3362b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build.sh
View File

@ -300,6 +300,10 @@ if [ "$DEBUG" ]; then
set -x set -x
fi fi
if [ "$HAS_GAPPS" ] && [ "$ROOT_SOL" = "kernelsu" ]; then
abort "Unsupported combination: Install GApps and KernelSU"
fi
# shellcheck disable=SC1091 # shellcheck disable=SC1091
[ -f "$PYTHON_VENV_DIR/bin/activate" ] && { [ -f "$PYTHON_VENV_DIR/bin/activate" ] && {
source "$PYTHON_VENV_DIR/bin/activate" || abort "Failed to activate virtual environment, please re-run install_deps.sh" source "$PYTHON_VENV_DIR/bin/activate" || abort "Failed to activate virtual environment, please re-run install_deps.sh"

3
scripts/run.sh
View File

@ -98,11 +98,10 @@ if [ "$ROOT_SOL" = "magisk" ]; then
'debug' "Canary Channel Debug Build" 'off' 'debug' "Canary Channel Debug Build" 'off'
) )
COMMAND_LINE+=(--magisk-ver "$MAGISK_VER") COMMAND_LINE+=(--magisk-ver "$MAGISK_VER")
fi
if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")'); then if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")'); then
COMMAND_LINE+=(--install-gapps) COMMAND_LINE+=(--install-gapps)
fi fi
fi
if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to remove Amazon Appstore?")' no); then if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to remove Amazon Appstore?")' no); then
COMMAND_LINE+=(--remove-amazon) COMMAND_LINE+=(--remove-amazon)