From 7f8a7af174de536f34240a6bebf93ad510a35cd7 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Wed, 23 Nov 2022 16:10:41 +0800 Subject: [PATCH] No need to store WSA's `msixbundle` separately WSA's `msixbundle` is a `neutral` package which contains different architectures in the same package. --- scripts/build.sh | 2 +- scripts/generateWSALinks.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index f4bf021..0e6935a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -328,7 +328,7 @@ RELEASE_NAME=${RELEASE_NAME_MAP[$RELEASE_TYPE]} || abort echo -e "Build: RELEASE_TYPE=$RELEASE_NAME" -WSA_ZIP_PATH=$DOWNLOAD_DIR/wsa-$ARCH-$RELEASE_TYPE.zip +WSA_ZIP_PATH=$DOWNLOAD_DIR/wsa-$RELEASE_TYPE.zip vclibs_PATH=$DOWNLOAD_DIR/Microsoft.VCLibs."$ARCH".14.00.Desktop.appx xaml_PATH=$DOWNLOAD_DIR/Microsoft.UI.Xaml_"$ARCH".appx MAGISK_ZIP=magisk-$MAGISK_VER.zip diff --git a/scripts/generateWSALinks.py b/scripts/generateWSALinks.py index 8314a29..7f1799e 100644 --- a/scripts/generateWSALinks.py +++ b/scripts/generateWSALinks.py @@ -91,7 +91,7 @@ for i, v, f in identities: # out_file_name = f"Microsoft.VCLibs.140.00.UWPDesktop_{arch}.appx" # out_file = download_dir / out_file_name elif re.match(f"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", f): - out_file_name = f"wsa-{arch}-{release_type}.zip" + out_file_name = f"wsa-{release_type}.zip" out_file = download_dir / out_file_name else: continue