Mirrors/WSABuilds
2
0
Fork 0
mirror of https://github.com/MustardChef/WSABuilds.git synced 2024-11-10 21:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Fix MindTheGapps integration

Browse Source 
* Fix MindTheGapps integration failure in build.sh due to missing element in GAPPS_BRAND_MAP and GAPPS_VARIANT_MAP
* Change MindTheGApps to MindTheGapps as that is the official name of the project[1]
* Add PRODUCT_SIZE caculation as MindTheGApps has gapps blobs and packages in product partion too

ref:
[1] https://gitlab.com/MindTheGapps/vendor_gapps
This commit is contained in:
someone5678 2022-09-03 23:26:38 +09:00
parent b03a18f7d1
commit 07d36084cc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build.sh
View File

@ -102,7 +102,7 @@ usage(){
--arch Architecture of WSA, x64 or arm64, default: $ARCH --arch Architecture of WSA, x64 or arm64, default: $ARCH
--release-type Release type of WSA, retail, RP (Release Preview), WIS (Insider Slow) or WIF (Insider Fast), default: $RELEASE_TYPE --release-type Release type of WSA, retail, RP (Release Preview), WIS (Insider Slow) or WIF (Insider Fast), default: $RELEASE_TYPE
--magisk-ver Magisk version, stable or canary, default: $MAGISK_VER --magisk-ver Magisk version, stable or canary, default: $MAGISK_VER
--gapps-brand GApps brand, OpenGApps or MindTheGApps, default: $GAPPS_BRAND --gapps-brand GApps brand, OpenGApps or MindTheGapps, default: $GAPPS_BRAND
--gapps-variant GApps variant, pico or full, etc...., default: $GAPPS_VARIANT --gapps-variant GApps variant, pico or full, etc...., default: $GAPPS_VARIANT
--root-sol Root solution, magisk or none, default: $ROOT_SOL --root-sol Root solution, magisk or none, default: $ROOT_SOL
--remove-amazon Remove Amazon Appstore from the system, default: false --remove-amazon Remove Amazon Appstore from the system, default: false
@ -183,7 +183,7 @@ MAGISK_VER_MAP=(
GAPPS_BRAND_MAP=( GAPPS_BRAND_MAP=(
"OpenGApps" "OpenGApps"
"MindTheGApps" "MindTheGapps"
"none" "none"
) )
@ -198,6 +198,7 @@ GAPPS_VARIANT_MAP=(
"tvstock" "tvstock"
"tvmini" "tvmini"
"none" "none"
"MindTheGapps"
) )
ROOT_SOL_MAP=( ROOT_SOL_MAP=(
@ -382,6 +383,9 @@ if [ -d "$WORK_DIR"/gapps ]; then
if [ -d "$WORK_DIR"/gapps/system_ext ]; then if [ -d "$WORK_DIR"/gapps/system_ext ]; then
SYSTEM_SIZE=$(( SYSTEM_SIZE - $(du --apparent-size -sB512 "$WORK_DIR"/gapps/system_ext | cut -f1) )) SYSTEM_SIZE=$(( SYSTEM_SIZE - $(du --apparent-size -sB512 "$WORK_DIR"/gapps/system_ext | cut -f1) ))
fi fi
if [ -d "$WORK_DIR"/gapps/product ]; then
PRODUCT_SIZE=$(( PRODUCT_SIZE - $(du --apparent-size -sB512 "$WORK_DIR"/gapps/product | cut -f1) ))
fi
fi fi
if [ -d "$WORK_DIR"/magisk ]; then if [ -d "$WORK_DIR"/magisk ]; then
SYSTEM_SIZE=$(( SYSTEM_SIZE + $(du --apparent-size -sB512 "$WORK_DIR"/magisk/magisk | cut -f1) )) SYSTEM_SIZE=$(( SYSTEM_SIZE + $(du --apparent-size -sB512 "$WORK_DIR"/magisk/magisk | cut -f1) ))

2
scripts/run.sh
View File

@ -21,6 +21,8 @@
# DEBUG=--debug # DEBUG=--debug
# CUSTOM_MAGISK=--magisk-custom # CUSTOM_MAGISK=--magisk-custom
DOWNLOAD_DIR=../download
if [ ! "$BASH_VERSION" ] ; then if [ ! "$BASH_VERSION" ] ; then
echo "Please do not use sh to run this script, just execute it directly" 1>&2 echo "Please do not use sh to run this script, just execute it directly" 1>&2
exit 1 exit 1