mirror of
https://github.com/MustardChef/WSABuilds.git
synced 2024-12-24 18:31:49 +01:00
fix: magisk version
This commit is contained in:
Peter Njeim
parent
452cb34422
commit
6429795850
4
.github/workflows/build.yaml
vendored
4
.github/workflows/build.yaml
vendored
@ -144,7 +144,7 @@ jobs:
|
||||
run: |
|
||||
declare -A magisk_vers=( ["Stable"]="stable" ["Beta"]="beta" ["Canary"]="canary" ["Debug"]="debug" )
|
||||
|
||||
magisk_ver="${magisk_vers[${{ inputs.magisk_ver }}]}"
|
||||
magisk_ver="{{ inputs.magisk_ver }}"
|
||||
gapps_var="${{ inputs.gapps_var }}"
|
||||
remove_amazon="${{ inputs.remove_amazon }}"
|
||||
|
||||
@ -153,7 +153,7 @@ jobs:
|
||||
elif [[ "$magisk_ver" = "Custom (URL)" ]]; then
|
||||
magiskVer="_Magisk-Custom"
|
||||
else
|
||||
magiskVer="_Magisk-$(curl -s https://raw.githubusercontent.com/topjohnwu/magisk-files/master/$magisk_ver.json | jq -r ".magisk.version")"
|
||||
magiskVer="_Magisk-$(curl -s https://raw.githubusercontent.com/topjohnwu/magisk-files/master/${magisk_vers[${{ inputs.magisk_ver }}]}.json | jq -r ".magisk.version")"
|
||||
fi
|
||||
|
||||
if [[ "$gapps_var" = "None" ]]; then
|
||||
|
||||
154
scripts/run.sh
154
scripts/run.sh
@ -1,154 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# This file is part of MagiskOnWSALocal.
|
||||
#
|
||||
# MagiskOnWSALocal is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# MagiskOnWSALocal is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# 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) 2022 LSPosed Contributors
|
||||
#
|
||||
|
||||
# DEBUG=--debug
|
||||
# CUSTOM_MAGISK=--magisk-custom
|
||||
if [ ! "$BASH_VERSION" ] ; then
|
||||
echo "Please do not use sh to run this script, just execute it directly" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
cd "$(dirname "$0")" || exit 1
|
||||
|
||||
abort(){
|
||||
echo "Dependencies: an error has occurred, exit"
|
||||
exit 1
|
||||
}
|
||||
|
||||
function Radiolist {
|
||||
declare -A o="$1"
|
||||
shift
|
||||
if ! whiptail --nocancel --radiolist "${o[title]}" 0 0 0 "$@" 3>&1 1>&2 2>&3; then
|
||||
echo "${o[default]}"
|
||||
fi
|
||||
}
|
||||
|
||||
function YesNoBox {
|
||||
declare -A o="$1"
|
||||
shift
|
||||
whiptail --title "${o[title]}" --yesno "${o[text]}" 0 0
|
||||
}
|
||||
|
||||
echo "Dependencies"
|
||||
sudo apt update && sudo apt -y install setools lzip wine winetricks patchelf whiptail e2fsprogs python3-pip aria2
|
||||
python3 -m pip install requests
|
||||
cp -r ../wine/.cache/* ~/.cache
|
||||
winetricks msxml6 || abort
|
||||
|
||||
ARCH=$(
|
||||
Radiolist '([title]="Build arch"
|
||||
[default]="x64")' \
|
||||
\
|
||||
'x64' "X86_64" 'on' \
|
||||
'arm64' "AArch64" 'off'
|
||||
)
|
||||
|
||||
RELEASE_TYPE=$(
|
||||
Radiolist '([title]="WSA release type"
|
||||
[default]="retail")' \
|
||||
\
|
||||
'retail' "Stable Channel" 'on' \
|
||||
'release preview' "Release Preview Channel" 'off' \
|
||||
'insider slow' "Beta Channel" 'off' \
|
||||
'insider fast' "Dev Channel" 'off'
|
||||
)
|
||||
if [ "$CUSTOM_MAGISK" != "1" ]; then
|
||||
MAGISK_VER=$(
|
||||
Radiolist '([title]="Magisk version"
|
||||
[default]="stable")' \
|
||||
\
|
||||
'stable' "Stable Channel" 'on' \
|
||||
'beta' "Beta Channel" 'off' \
|
||||
'canary' "Canary Channel" 'off' \
|
||||
'debug' "Canary Channel Debug Build" 'off'
|
||||
)
|
||||
else
|
||||
MAGISK_VER=debug
|
||||
fi
|
||||
|
||||
if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")'); then
|
||||
if [ -f "$DOWNLOAD_DIR"/MindTheGapps-"$ARCH".zip ]; then
|
||||
GAPPS_BRAND=$(
|
||||
Radiolist '([title]="Which GApps do you want to install?"
|
||||
[default]="OpenGApps")' \
|
||||
\
|
||||
'OpenGApps' "" 'on' \
|
||||
'MindTheGapps' "" 'off'
|
||||
)
|
||||
else
|
||||
GAPPS_BRAND="OpenGApps"
|
||||
fi
|
||||
else
|
||||
GAPPS_VARIANT="none"
|
||||
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=pico
|
||||
fi
|
||||
else
|
||||
GAPPS_VARIANT=$GAPPS_BRAND
|
||||
fi
|
||||
|
||||
if (YesNoBox '([title]="Remove Amazon AppStore" [text]="Do you want to keep Amazon AppStore?")'); then
|
||||
REMOVE_AMAZON=""
|
||||
else
|
||||
REMOVE_AMAZON="--remove-amazon"
|
||||
fi
|
||||
|
||||
ROOT_SOL=$(
|
||||
Radiolist '([title]="Root solution"
|
||||
[default]="magisk")' \
|
||||
\
|
||||
'magisk' "" 'on' \
|
||||
'none' "" 'off'
|
||||
)
|
||||
|
||||
if (YesNoBox '([title]="Compress output" [text]="Do you want to compress the output?")'); then
|
||||
COMPRESS_OUTPUT="--compress"
|
||||
else
|
||||
COMPRESS_OUTPUT=""
|
||||
fi
|
||||
|
||||
# if ! (YesNoBox '([title]="Off line mode" [text]="Do you want to enable off line mode?")'); then
|
||||
# OFFLINE="--offline"
|
||||
# else
|
||||
# OFFLINE=""
|
||||
# fi
|
||||
# OFFLINE="--offline"
|
||||
clear
|
||||
|
||||
COMMAND_LINE=(--arch "$ARCH" --release-type "$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")
|
||||
echo "COMMAND_LINE=${COMMAND_LINE[*]}"
|
||||
./build.sh "${COMMAND_LINE[@]}"
|
||||
Loading…
Reference in New Issue
Block a user