Mirrors/WSABuilds
2
0
Fork 0
mirror of https://github.com/MustardChef/WSABuilds.git synced 2024-12-24 18:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

close #32

Browse Source
This commit is contained in:
Howard20181 2022-08-23 20:34:26 +08:00
parent f2b05674dc
commit 9905925e64
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/downloadGapps.py
View File

@ -15,8 +15,8 @@ if not os.path.exists(Path.cwd().parent / "download"):
download_dir = Path.cwd().parent / "download" download_dir = Path.cwd().parent / "download"
arch = sys.argv[1] arch = sys.argv[1]
# TODO: Keep it pico since other variants of opengapps are unable to boot successfully
variant = sys.argv[2] if 0 else "pico" variant = sys.argv[2]
abi_map = {"x64": "x86_64", "arm64": "arm64"} abi_map = {"x64": "x86_64", "arm64": "arm64"}
# TODO: keep it 11.0 since opengapps does not support 12+ yet # TODO: keep it 11.0 since opengapps does not support 12+ yet
# As soon as opengapps is available for 12+, we need to get the sdk/release from build.prop and # As soon as opengapps is available for 12+, we need to get the sdk/release from build.prop and

9
scripts/run.sh
View File

@ -164,6 +164,7 @@ if [ -f "$WSA_WORK_ENV" ]; then rm -f "${WSA_WORK_ENV:?}"; fi
export WSA_WORK_ENV export WSA_WORK_ENV
python3 extractWSA.py "$ARCH" "$WORK_DIR" || abort python3 extractWSA.py "$ARCH" "$WORK_DIR" || abort
echo -e "Extract done\n" echo -e "Extract done\n"
source "${WORK_DIR:?}/ENV"
echo "Download Magisk" echo "Download Magisk"
python3 downloadMagisk.py "$ARCH" "$MAGISK_VER" "$WORK_DIR" || abort python3 downloadMagisk.py "$ARCH" "$MAGISK_VER" "$WORK_DIR" || abort
@ -172,7 +173,11 @@ echo -e "done\n"
if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; then if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; then
if [ $GAPPS_BRAND = "OpenGapps" ]; then if [ $GAPPS_BRAND = "OpenGapps" ]; then
echo "Download OpenGApps" echo "Download OpenGApps"
python3 downloadGapps.py "$ARCH" "$MAGISK_VER" || abort if [ "$WSA_MAIN_VER" -ge 2204 ]; then
python3 downloadGapps.py "$ARCH" "pico" || abort # TODO: Keep it pico since other variants of opengapps are unable to boot successfully
else
python3 downloadGapps.py "$ARCH" "$GAPPS_VARIANT" || abort
fi
echo -e "Download done\n" echo -e "Download done\n"
fi fi
echo "Extract GApps" echo "Extract GApps"
@ -546,7 +551,7 @@ EOF
echo -e "Remove signature and add scripts done\n" echo -e "Remove signature and add scripts done\n"
echo "Generate info" echo "Generate info"
source "${WORK_DIR:?}/ENV"
if [[ "$ROOT_SOL" = "none" ]]; then if [[ "$ROOT_SOL" = "none" ]]; then
name1="" name1=""
elif [[ "$ROOT_SOL" = "" ]]; then elif [[ "$ROOT_SOL" = "" ]]; then