Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix run.sh #778

Merged
merged 2 commits into from
Mar 3, 2024
Merged

Fix run.sh #778

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
502cd8b
Fix run.sh
s1204IT Mar 3, 2024
8d374b7
Fix shellcheck
s1204IT Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 10 additions & 43 deletions scripts/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with MagiskOnWSALocal. If not, see <https://www.gnu.org/licenses/>.
#
# Copyright (C) 2023 LSPosed Contributors
# Copyright (C) 2024 LSPosed Contributors
#

# DEBUG=--debug
Expand Down Expand Up @@ -100,45 +100,16 @@ else
fi

if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")'); then
# GAPPS_BRAND=$(
# Radiolist '([title]="Which GApps do you want to install?"
# [default]="MindTheGapps")' \
# 'MindTheGapps' "Recommend" 'on' \
# 'OpenGApps' "This flavor may cause startup failure" 'off'
# )
GAPPS_BRAND="MindTheGapps"
INSTALL_GAPPS="--install-gapps"
else
GAPPS_BRAND="none"
INSTALL_GAPPS=""
fi

if [ "$GAPPS_BRAND" = "OpenGApps" ]; then
# TODO: Keep it pico since other variants of opengapps are unable to boot successfully
if [ "$DEBUG" = "1" ]; then
GAPPS_VARIANT=$(
Radiolist '([title]="Variants of GApps"
[default]="pico")' \
'super' "" 'off' \
'stock' "" 'off' \
'full' "" 'off' \
'mini' "" 'off' \
'micro' "" 'off' \
'nano' "" 'off' \
'pico' "" 'on' \
'tvstock' "" 'off' \
'tvmini' "" 'off'
)
else
GAPPS_VARIANT=""
fi
else
GAPPS_VARIANT=""
fi

if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to keep Amazon Appstore?")'); then
REMOVE_AMAZON=""
else
REMOVE_AMAZON="--remove-amazon"
fi
# if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to keep Amazon Appstore?")'); then
# REMOVE_AMAZON=""
# else
# REMOVE_AMAZON="--remove-amazon"
# fi

if (YesNoBox '([title]="Compress output" [text]="Do you want to compress the output?")'); then
COMPRESS_OUTPUT="--compress"
Expand All @@ -156,8 +127,8 @@ fi

clear
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]}" --root-sol "$ROOT_SOL" --gapps-brand "$GAPPS_BRAND")
CHECK_NULL_LIST=("$REMOVE_AMAZON" "$COMPRESS_OUTPUT" "$OFFLINE" "$DEBUG" "$CUSTOM_MAGISK")
COMMAND_LINE=(--arch "$ARCH" --release-type "${RELEASE_TYPE_MAP[$RELEASE_TYPE]}" --root-sol "$ROOT_SOL")
CHECK_NULL_LIST=("$INSTALL_GAPPS" "$REMOVE_AMAZON" "$COMPRESS_OUTPUT" "$OFFLINE" "$DEBUG" "$CUSTOM_MAGISK")
for i in "${CHECK_NULL_LIST[@]}"; do
if [ -n "$i" ]; then
COMMAND_LINE+=("$i")
Expand All @@ -168,10 +139,6 @@ 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
Expand Down
Loading