vikarti.anatra/MagiskOnWSALocal
1
0
Fork 0
mirror of https://github.com/LSPosed/MagiskOnWSALocal.git synced 2025-09-01 18:20:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Download Microsoft component packages while using --skip-download-wsa (#698)

Browse source 
Co-authored-by: Doddddd <88972478+Doddddd@users.noreply.github.com>
This commit is contained in:
sn-o-w 2023-10-24 16:38:50 +03:00 • committed by GitHub
parent f55c188e49
commit 0c4c7521f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/build.sh Executable file → Normal file
View file

@ -509,6 +509,8 @@ if [ -z ${OFFLINE+x} ]; then
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "$WSA_WORK_ENV" || abort source "$WSA_WORK_ENV" || abort
else else
echo "Generate Download Links"
python3 generateWSALinks.py "$ARCH" "$RELEASE_TYPE" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" "$DOWN_WSA" || abort
WSA_MAJOR_VER=$(python3 getWSAMajorVersion.py "$ARCH" "$WSA_ZIP_PATH") WSA_MAJOR_VER=$(python3 getWSAMajorVersion.py "$ARCH" "$WSA_ZIP_PATH")
fi fi
if [[ "$WSA_MAJOR_VER" -lt 2211 ]]; then if [[ "$WSA_MAJOR_VER" -lt 2211 ]]; then

3
scripts/generateWSALinks.py
View file

@ -61,6 +61,7 @@ download_dir = Path.cwd().parent / \
"download" if sys.argv[3] == "" else Path(sys.argv[3]) "download" if sys.argv[3] == "" else Path(sys.argv[3])
ms_account_conf = download_dir/".ms_account" ms_account_conf = download_dir/".ms_account"
tempScript = sys.argv[4] tempScript = sys.argv[4]
skip_wsa_download = sys.argv[5] == "no" if len(sys.argv) >= 6 else False
cat_id = '858014f3-3934-4abe-8078-4aa193e74ca8' cat_id = '858014f3-3934-4abe-8078-4aa193e74ca8'
user = '' user = ''
session = Session() session = Session()
@ -153,7 +154,7 @@ for filename, values in identities.items():
elif re.match(f"Microsoft\.VCLibs\..+_.*_{arch}_.*\.appx", filename): elif re.match(f"Microsoft\.VCLibs\..+_.*_{arch}_.*\.appx", filename):
out_file_name = f"{values[1]}_{arch}.appx" out_file_name = f"{values[1]}_{arch}.appx"
out_file = download_dir / out_file_name out_file = download_dir / out_file_name
elif re.match(f"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", filename): elif not skip_wsa_download and re.match(f"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", filename):
tmp_wsa_build_ver = re.search(u'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group() tmp_wsa_build_ver = re.search(u'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group()
if(wsa_build_ver == 0): if(wsa_build_ver == 0):
wsa_build_ver = tmp_wsa_build_ver wsa_build_ver = tmp_wsa_build_ver