Add back remove amazon

Amazon Apps only ship in the apex module on a high version of WSA,
so just simply delete it
For the WSA upgrade from the older version which already installed this module,
run `adb shell pm uninstall com.microsoft.mado` to remove it.
This commit is contained in:
Howard Wu 2024-03-06 00:58:52 +08:00
parent 511374f77f
commit 730070d44a
2 changed files with 13 additions and 3 deletions

View File

@ -195,6 +195,7 @@ ARGUMENT_LIST=(
"magisk-ver:" "magisk-ver:"
"magisk-custom" "magisk-custom"
"install-gapps" "install-gapps"
"remove-amazon"
"offline" "offline"
"skip-download-wsa" "skip-download-wsa"
"help" "help"
@ -242,6 +243,10 @@ while [[ $# -gt 0 ]]; do
HAS_GAPPS=1 HAS_GAPPS=1
shift shift
;; ;;
--remove-amazon)
REMOVE_AMAZON=1
shift
;;
--offline) --offline)
OFFLINE=1 OFFLINE=1
shift shift
@ -518,6 +523,10 @@ if [ "$HAS_GAPPS" ]; then
fi fi
fi fi
if [ "$REMOVE_AMAZON" ]; then
rm -f "$WORK_DIR/wsa/$ARCH/apex/"mado*.apex || abort
fi
echo "Removing signature and add scripts" echo "Removing signature and add scripts"
rm -rf "${WORK_DIR:?}"/wsa/"$ARCH"/\[Content_Types\].xml "$WORK_DIR/wsa/$ARCH/AppxBlockMap.xml" "$WORK_DIR/wsa/$ARCH/AppxSignature.p7x" "$WORK_DIR/wsa/$ARCH/AppxMetadata" || abort rm -rf "${WORK_DIR:?}"/wsa/"$ARCH"/\[Content_Types\].xml "$WORK_DIR/wsa/$ARCH/AppxBlockMap.xml" "$WORK_DIR/wsa/$ARCH/AppxSignature.p7x" "$WORK_DIR/wsa/$ARCH/AppxMetadata" || abort
cp "$vclibs_PATH" "$xaml_PATH" "$WORK_DIR/wsa/$ARCH" || abort cp "$vclibs_PATH" "$xaml_PATH" "$WORK_DIR/wsa/$ARCH" || abort
@ -543,6 +552,7 @@ else
name2=-GApps-${ANDROID_API_MAP[$ANDROID_API]} name2=-GApps-${ANDROID_API_MAP[$ANDROID_API]}
fi fi
artifact_name=WSA_${WSA_VER}_${ARCH}_${WSA_REL}${name1}${name2} artifact_name=WSA_${WSA_VER}_${ARCH}_${WSA_REL}${name1}${name2}
[ "$REMOVE_AMAZON" ] && artifact_name+=-NoAmazon
if [ -f "$OUTPUT_DIR" ]; then if [ -f "$OUTPUT_DIR" ]; then
rm -rf ${OUTPUT_DIR:?} rm -rf ${OUTPUT_DIR:?}

View File

@ -104,9 +104,9 @@ if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")')
COMMAND_LINE+=(--install-gapps) COMMAND_LINE+=(--install-gapps)
fi fi
# if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to remove Amazon Appstore?")' no); then if (YesNoBox '([title]="Remove Amazon Appstore" [text]="Do you want to remove Amazon Appstore?")' no); then
# COMMAND_LINE+=(--remove-amazon) COMMAND_LINE+=(--remove-amazon)
# fi fi
if (YesNoBox '([title]="Compress output" [text]="Do you want to compress the output?")'); then if (YesNoBox '([title]="Compress output" [text]="Do you want to compress the output?")'); then
COMPRESS_FORMAT=$( COMPRESS_FORMAT=$(