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

Don't append null parameter

Browse Source 
Fix #484
This commit is contained in:
Howard Wu 2023-04-10 22:34:49 +08:00
parent 1ebd85b105
commit 04103a8fd2
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/run.sh
View File

@ -96,7 +96,7 @@ if [ "$ROOT_SOL" = "magisk" ]; then
'debug' "Canary Channel Debug Build" 'off' 'debug' "Canary Channel Debug Build" 'off'
) )
else else
MAGISK_VER=stable MAGISK_VER=""
fi 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
@ -109,6 +109,7 @@ if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")')
else else
GAPPS_BRAND="none" GAPPS_BRAND="none"
fi fi
if [ "$GAPPS_BRAND" = "OpenGApps" ]; then if [ "$GAPPS_BRAND" = "OpenGApps" ]; then
# TODO: Keep it pico since other variants of opengapps are unable to boot successfully # TODO: Keep it pico since other variants of opengapps are unable to boot successfully
if [ "$DEBUG" = "1" ]; then if [ "$DEBUG" = "1" ]; then
@ -126,10 +127,10 @@ if [ "$GAPPS_BRAND" = "OpenGApps" ]; then
'tvmini' "" 'off' 'tvmini' "" 'off'
) )
else else
GAPPS_VARIANT=pico GAPPS_VARIANT=""
fi fi
else else
GAPPS_VARIANT="pico" GAPPS_VARIANT=""
fi fi
if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to keep Amazon Appstore?")'); then if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to keep Amazon Appstore?")'); then
@ -154,7 +155,26 @@ fi
clear clear
declare -A RELEASE_TYPE_MAP=(["retail"]="retail" ["release preview"]="RP" ["insider slow"]="WIS" ["insider fast"]="WIF") declare -A RELEASE_TYPE_MAP=(["retail"]="retail" ["release preview"]="RP" ["insider slow"]="WIS" ["insider fast"]="WIF")
COMMAND_LINE=(--arch "$ARCH" --release-type "${RELEASE_TYPE_MAP[$RELEASE_TYPE]}" --magisk-ver "$MAGISK_VER" --gapps-brand "$GAPPS_BRAND" --gapps-variant "$GAPPS_VARIANT" "$REMOVE_AMAZON" --root-sol "$ROOT_SOL" "$COMPRESS_OUTPUT" "$OFFLINE" "$DEBUG" "$CUSTOM_MAGISK" --compress-format "$COMPRESS_FORMAT") COMMAND_LINE=(--arch "$ARCH" --release-type "${RELEASE_TYPE_MAP[$RELEASE_TYPE]}" --root-sol "$ROOT_SOL" --gapps-brand "$GAPPS_BRAND")
CHECK_NULL_LIST=("$REMOVE_AMAZON" "$COMPRESS_OUTPUT" "$OFFLINE" "$DEBUG" "$CUSTOM_MAGISK")
for i in "${CHECK_NULL_LIST[@]}"; do
if [ -n "$i" ]; then
COMMAND_LINE+=("$i")
fi
done
if [ -n "$MAGISK_VER" ]; then
COMMAND_LINE+=(--magisk-ver "$MAGISK_VER")
fi
if [ -n "$GAPPS_VARIANT" ]; then
COMMAND_LINE+=(--gapps-variant "$GAPPS_VARIANT")
fi
if [ -n "$COMPRESS_FORMAT" ]; then
COMMAND_LINE+=(--compress-format "$COMPRESS_FORMAT")
fi
echo "COMMAND_LINE=${COMMAND_LINE[*]}" echo "COMMAND_LINE=${COMMAND_LINE[*]}"
chmod +x ./build.sh chmod +x ./build.sh
./build.sh "${COMMAND_LINE[@]}" ./build.sh "${COMMAND_LINE[@]}"