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

Fix the problem that offline mode reports an error when choosing not to integrate GApps.

Browse Source
This commit is contained in:
Howard Wu 2022-09-01 11:11:43 +08:00
parent e717deaa1d
commit 2e07425e9f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/build.sh
View File

@ -213,6 +213,7 @@ check_list(){
local list_count=${#arr[@]} local list_count=${#arr[@]}
for i in "${arr[@]}"; do for i in "${arr[@]}"; do
if [ "$input" == "$i" ]; then if [ "$input" == "$i" ]; then
echo "INFO: $name: $input"
break break
fi fi
((list_count--)) ((list_count--))
@ -236,7 +237,7 @@ fi
declare -A RELEASE_NAME_MAP=(["retail"]="Retail" ["RP"]="Release Preview" ["WIS"]="Insider Slow" ["WIF"]="Insider Fast") declare -A RELEASE_NAME_MAP=(["retail"]="Retail" ["RP"]="Release Preview" ["WIS"]="Insider Slow" ["WIF"]="Insider Fast")
RELEASE_NAME=${RELEASE_NAME_MAP[$RELEASE_TYPE]} || abort RELEASE_NAME=${RELEASE_NAME_MAP[$RELEASE_TYPE]} || abort
echo -e "build: ARCH=$ARCH\nRELEASE_TYPE=$RELEASE_NAME\nMAGISK_VER=$MAGISK_VER\nGAPPS_VARIANT=$GAPPS_VARIANT\nROOT_SOL=$ROOT_SOL" echo -e "build: RELEASE_TYPE=$RELEASE_NAME"
WSA_ZIP_PATH=$DOWNLOAD_DIR/wsa-$ARCH-$RELEASE_TYPE.zip WSA_ZIP_PATH=$DOWNLOAD_DIR/wsa-$ARCH-$RELEASE_TYPE.zip
vclibs_PATH=$DOWNLOAD_DIR/vclibs-"$ARCH".appx vclibs_PATH=$DOWNLOAD_DIR/vclibs-"$ARCH".appx
@ -282,7 +283,7 @@ else
OFFLINE_ERR="1" OFFLINE_ERR="1"
fi fi
done done
if [ "$GAPPS_VARIANT" != 'none' ] && [ "$GAPPS_VARIANT" != '' ]; then if [ "$GAPPS_VARIANT" != 'none' ] && [ "$GAPPS_VARIANT" != '' ] && [ "$GAPPS_BRAND" != 'none' ]; then
if [ ! -f "$GAPPS_PATH" ]; then if [ ! -f "$GAPPS_PATH" ]; then
echo "Offline mode: missing [$GAPPS_PATH]." echo "Offline mode: missing [$GAPPS_PATH]."
OFFLINE_ERR="1" OFFLINE_ERR="1"
@ -328,7 +329,7 @@ else
fi fi
echo -e "done\n" echo -e "done\n"
if [ "$GAPPS_VARIANT" != 'none' ] && [ "$GAPPS_VARIANT" != '' ]; then if [ "$GAPPS_VARIANT" != 'none' ] && [ "$GAPPS_VARIANT" != '' ] && [ "$GAPPS_BRAND" != 'none' ]; then
echo "Extract GApps" echo "Extract GApps"
mkdir -p "$WORK_DIR"/gapps || abort mkdir -p "$WORK_DIR"/gapps || abort
if [ -f "$GAPPS_PATH" ]; then if [ -f "$GAPPS_PATH" ]; then
@ -353,7 +354,7 @@ if [ "$GAPPS_VARIANT" != 'none' ] && [ "$GAPPS_VARIANT" != '' ]; then
fi fi
else else
echo "The $GAPPS_BRAND zip package does not exist." echo "The $GAPPS_BRAND zip package does not exist."
exit 1 abort
fi fi
echo -e "Extract done\n" echo -e "Extract done\n"
fi fi
@ -531,7 +532,7 @@ find ../"$ARCH"/system/system/etc/permissions/ -maxdepth 1 -mindepth 1 -printf '
find ../"$ARCH"/system/system/etc/permissions/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I file sudo find "$MOUNT_DIR"/system/etc/permissions/file -type f -exec chcon --reference="$MOUNT_DIR"/system/etc/permissions/platform.xml {} \; find ../"$ARCH"/system/system/etc/permissions/ -maxdepth 1 -mindepth 1 -printf '%P\n' | xargs -I file sudo find "$MOUNT_DIR"/system/etc/permissions/file -type f -exec chcon --reference="$MOUNT_DIR"/system/etc/permissions/platform.xml {} \;
echo -e "Add extra packages done\n" echo -e "Add extra packages done\n"
if [ "$GAPPS_VARIANT" != 'none' ] && [ "$GAPPS_VARIANT" != '' ]; then if [ "$GAPPS_VARIANT" != 'none' ] && [ "$GAPPS_VARIANT" != '' ] && [ "$GAPPS_BRAND" != 'none' ]; then
echo "Integrate GApps" echo "Integrate GApps"
find "$WORK_DIR/gapps/" -mindepth 1 -type d -exec sudo chmod 0755 {} \; find "$WORK_DIR/gapps/" -mindepth 1 -type d -exec sudo chmod 0755 {} \;
@ -723,7 +724,7 @@ elif [[ "$ROOT_SOL" = "" ]]; then
else else
name1="-with-$ROOT_SOL-$MAGISK_VER" name1="-with-$ROOT_SOL-$MAGISK_VER"
fi fi
if [[ "$GAPPS_VARIANT" = "none" || "$GAPPS_VARIANT" = "" ]]; then if [[ "$GAPPS_VARIANT" = "none" || "$GAPPS_VARIANT" = "" || "$GAPPS_BRAND" != "none" ]]; then
name2="-NoGApps" name2="-NoGApps"
else else
if [ "$GAPPS_BRAND" = "OpenGApps" ]; then if [ "$GAPPS_BRAND" = "OpenGApps" ]; then