august/MagiskOnWSALocal
1
0
Fork 0
mirror of https://github.com/LSPosed/MagiskOnWSALocal.git synced 2025-05-06 06:46:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix 2303 build failed

Browse Source 
Fix #534

The commit also fixes an issue where the version number
was wrong when getting the download link online at the
same time when WSA was already downloaded
This commit is contained in:
Howard Wu 2023-05-14 00:33:09 +08:00
parent 6d5f3f4a67
commit 2364c36dbb
5 changed files with 121 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
scripts/build.sh
View File

@ -194,10 +194,9 @@ mk_erofs_umount() {
} }
ro_ext4_img_to_rw() { ro_ext4_img_to_rw() {
resize_img "$2" "$(($(du --apparent-size -sB512 "$2" | cut -f1) * 2))"s || return 1 resize_img "$1" "$(($(du --apparent-size -sB512 "$1" | cut -f1) * 2))"s || return 1
e2fsck -fp -E unshare_blocks "$2" || return 1 e2fsck -fp -E unshare_blocks "$1" || return 1
resize_img "$2" || return 1 resize_img "$1" || return 1
rm -f "$1" || return 1
return 0 return 0
} }
@ -463,9 +462,9 @@ update_gapps_zip_name() {
fi fi
GAPPS_PATH=$DOWNLOAD_DIR/$GAPPS_ZIP_NAME GAPPS_PATH=$DOWNLOAD_DIR/$GAPPS_ZIP_NAME
} }
DOWN_WSA_MAIN_VERSION=0 WSA_MAIN_VER=0
update_ksu_zip_name() { update_ksu_zip_name() {
if [ "$DOWN_WSA_MAIN_VERSION" -lt "2303" ]; then if [ "$WSA_MAIN_VER" -lt "2303" ]; then
KERNEL_VER="5.10.117.2" KERNEL_VER="5.10.117.2"
else else
KERNEL_VER="5.15.78.1" KERNEL_VER="5.15.78.1"
@ -484,13 +483,13 @@ if [ -z ${OFFLINE+x} ]; then
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "$WSA_WORK_ENV" || abort source "$WSA_WORK_ENV" || abort
else else
DOWN_WSA_MAIN_VERSION=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH") WSA_MAIN_VER=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH")
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -lt 2211 ]]; then if [[ "$WSA_MAIN_VER" -lt 2211 ]]; then
ANDROID_API=32 ANDROID_API=32
update_gapps_zip_name update_gapps_zip_name
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2303 ]]; then if [[ "$WSA_MAIN_VER" -ge 2303 ]]; then
update_ksu_zip_name update_ksu_zip_name
fi fi
if [ "$ROOT_SOL" = "magisk" ] || [ "$GAPPS_BRAND" != "none" ]; then if [ "$ROOT_SOL" = "magisk" ] || [ "$GAPPS_BRAND" != "none" ]; then
@ -515,12 +514,12 @@ if [ -z ${OFFLINE+x} ]; then
exit 1 exit 1
fi fi
else # Offline mode else # Offline mode
DOWN_WSA_MAIN_VERSION=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH") WSA_MAIN_VER=$(python3 getWSAMainVersion.py "$ARCH" "$WSA_ZIP_PATH")
if [[ "$DOWN_WSA_MAIN_VERSION" -lt 2211 ]]; then if [[ "$WSA_MAIN_VER" -lt 2211 ]]; then
ANDROID_API=32 ANDROID_API=32
update_gapps_zip_name update_gapps_zip_name
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2303 ]]; then if [[ "$WSA_MAIN_VER" -ge 2303 ]]; then
update_ksu_zip_name update_ksu_zip_name
fi fi
declare -A FILES_CHECK_LIST=([WSA_ZIP_PATH]="$WSA_ZIP_PATH" [xaml_PATH]="$xaml_PATH" [vclibs_PATH]="$vclibs_PATH" [UWPVCLibs_PATH]="$UWPVCLibs_PATH") declare -A FILES_CHECK_LIST=([WSA_ZIP_PATH]="$WSA_ZIP_PATH" [xaml_PATH]="$xaml_PATH" [vclibs_PATH]="$vclibs_PATH" [UWPVCLibs_PATH]="$UWPVCLibs_PATH")
@ -634,7 +633,10 @@ if [ "$GAPPS_BRAND" != 'none' ]; then
echo -e "Extract done\n" echo -e "Extract done\n"
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then cat "$WSA_WORK_ENV"
echo -e "\n"
if [[ "$WSA_MAIN_VER" -ge 2302 ]]; then
echo "Convert vhdx to RAW image" echo "Convert vhdx to RAW image"
vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/system_ext.vhdx" "$WORK_DIR/wsa/$ARCH/system_ext.img" || abort vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/system_ext.vhdx" "$WORK_DIR/wsa/$ARCH/system_ext.img" || abort
vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/product.vhdx" "$WORK_DIR/wsa/$ARCH/product.img" || abort vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/product.vhdx" "$WORK_DIR/wsa/$ARCH/product.img" || abort
@ -642,7 +644,7 @@ if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then
vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/vendor.vhdx" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort vhdx_to_raw_img "$WORK_DIR/wsa/$ARCH/vendor.vhdx" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort
echo -e "Convert vhdx to RAW image done\n" echo -e "Convert vhdx to RAW image done\n"
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2304 ]]; then if [[ "$WSA_MAIN_VER" -ge 2304 ]]; then
echo "Mount images" echo "Mount images"
sudo mkdir -p -m 755 "$ROOT_MNT_RO" || abort sudo mkdir -p -m 755 "$ROOT_MNT_RO" || abort
sudo chown "0:0" "$ROOT_MNT_RO" || abort sudo chown "0:0" "$ROOT_MNT_RO" || abort
@ -658,15 +660,15 @@ if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2304 ]]; then
mk_overlayfs "$PRODUCT_MNT_RO" product "$PRODUCT_MNT" || abort mk_overlayfs "$PRODUCT_MNT_RO" product "$PRODUCT_MNT" || abort
mk_overlayfs "$SYSTEM_EXT_MNT_RO" system_ext "$SYSTEM_EXT_MNT" || abort mk_overlayfs "$SYSTEM_EXT_MNT_RO" system_ext "$SYSTEM_EXT_MNT" || abort
echo -e "Create overlayfs for EROFS done\n" echo -e "Create overlayfs for EROFS done\n"
elif [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then elif [[ "$WSA_MAIN_VER" -ge 2302 ]]; then
echo "Remove read-only flag for read-only EXT4 image" echo "Remove read-only flag for read-only EXT4 image"
ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system_ext.img" "$WORK_DIR/wsa/$ARCH/system_ext.img" || abort ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system_ext.img" || abort
ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/product.img" "$WORK_DIR/wsa/$ARCH/product.img" || abort ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/product.img" || abort
ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system.img" "$WORK_DIR/wsa/$ARCH/system.img" || abort ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/system.img" || abort
ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/vendor.img" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort ro_ext4_img_to_rw "$WORK_DIR/wsa/$ARCH/vendor.img" || abort
echo -e "Remove read-only flag for read-only EXT4 image\n" echo -e "Remove read-only flag for read-only EXT4 image done\n"
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -lt 2304 ]]; then if [[ "$WSA_MAIN_VER" -lt 2304 ]]; then
echo "Calculate the required space" echo "Calculate the required space"
EXTRA_SIZE=10240 EXTRA_SIZE=10240
@ -738,28 +740,24 @@ echo -e "done\n"
if [ "$ROOT_SOL" = 'magisk' ]; then if [ "$ROOT_SOL" = 'magisk' ]; then
echo "Integrate Magisk" echo "Integrate Magisk"
sudo mkdir "$ROOT_MNT/sbin" sudo cp "$WORK_DIR/magisk/magisk/"* "$ROOT_MNT/debug_ramdisk/"
sudo setfattr -n security.selinux -v "u:object_r:rootfs:s0" "$ROOT_MNT/sbin" || abort sudo cp "$MAGISK_PATH" "$ROOT_MNT/debug_ramdisk/magisk.apk" || abort
sudo chown root:root "$ROOT_MNT/sbin" sudo tee -a "$ROOT_MNT/debug_ramdisk/loadpolicy.sh" <<EOF >/dev/null || abort
sudo chmod 0700 "$ROOT_MNT/sbin"
sudo cp "$WORK_DIR/magisk/magisk/"* "$ROOT_MNT/sbin/"
sudo cp "$MAGISK_PATH" "$ROOT_MNT/sbin/magisk.apk" || abort
sudo tee -a "$ROOT_MNT/sbin/loadpolicy.sh" <<EOF >/dev/null || abort
#!/system/bin/sh #!/system/bin/sh
mkdir -p /data/adb/magisk mkdir -p /data/adb/magisk
cp /sbin/* /data/adb/magisk/ cp /debug_ramdisk/* /data/adb/magisk/
sync sync
chmod -R 755 /data/adb/magisk chmod -R 755 /data/adb/magisk
restorecon -R /data/adb/magisk restorecon -R /data/adb/magisk
for module in \$(ls /data/adb/modules); do for module in \$(ls /data/adb/modules); do
if ! [ -f "/data/adb/modules/\$module/disable" ] && [ -f "/data/adb/modules/\$module/sepolicy.rule" ]; then if ! [ -f "/data/adb/modules/\$module/disable" ] && [ -f "/data/adb/modules/\$module/sepolicy.rule" ]; then
/sbin/magiskpolicy --live --apply "/data/adb/modules/\$module/sepolicy.rule" /debug_ramdisk/magiskpolicy --live --apply "/data/adb/modules/\$module/sepolicy.rule"
fi fi
done done
EOF EOF
sudo find "$ROOT_MNT/sbin" -type f -exec chmod 0755 {} \; sudo find "$ROOT_MNT/debug_ramdisk" -type f -exec chmod 0755 {} \;
sudo find "$ROOT_MNT/sbin" -type f -exec chown root:root {} \; sudo find "$ROOT_MNT/debug_ramdisk" -type f -exec chown root:root {} \;
sudo find "$ROOT_MNT/sbin" -type f -exec setfattr -n security.selinux -v "u:object_r:system_file:s0" {} \; || abort sudo find "$ROOT_MNT/debug_ramdisk" -type f -exec setfattr -n security.selinux -v "u:object_r:system_file:s0" {} \; || abort
MAGISK_TMP_PATH=$(Gen_Rand_Str 14) MAGISK_TMP_PATH=$(Gen_Rand_Str 14)
echo "/dev/$MAGISK_TMP_PATH(/.*)? u:object_r:magisk_file:s0" | sudo tee -a "$VENDOR_MNT/etc/selinux/vendor_file_contexts" echo "/dev/$MAGISK_TMP_PATH(/.*)? u:object_r:magisk_file:s0" | sudo tee -a "$VENDOR_MNT/etc/selinux/vendor_file_contexts"
@ -772,23 +770,25 @@ EOF
on post-fs-data on post-fs-data
mkdir /dev/$MAGISK_TMP_PATH mkdir /dev/$MAGISK_TMP_PATH
mount tmpfs tmpfs /dev/$MAGISK_TMP_PATH mode=0755 mount tmpfs tmpfs /dev/$MAGISK_TMP_PATH mode=0755
copy /sbin/magisk64 /dev/$MAGISK_TMP_PATH/magisk64
copy /debug_ramdisk/magisk64 /dev/$MAGISK_TMP_PATH/magisk64
chmod 0755 /dev/$MAGISK_TMP_PATH/magisk64 chmod 0755 /dev/$MAGISK_TMP_PATH/magisk64
symlink ./magisk64 /dev/$MAGISK_TMP_PATH/magisk symlink ./magisk64 /dev/$MAGISK_TMP_PATH/magisk
symlink ./magisk64 /dev/$MAGISK_TMP_PATH/su symlink ./magisk64 /dev/$MAGISK_TMP_PATH/su
symlink ./magisk64 /dev/$MAGISK_TMP_PATH/resetprop symlink ./magisk64 /dev/$MAGISK_TMP_PATH/resetprop
copy /sbin/magisk32 /dev/$MAGISK_TMP_PATH/magisk32 copy /debug_ramdisk/magisk32 /dev/$MAGISK_TMP_PATH/magisk32
chmod 0755 /dev/$MAGISK_TMP_PATH/magisk32 chmod 0755 /dev/$MAGISK_TMP_PATH/magisk32
copy /sbin/magiskinit /dev/$MAGISK_TMP_PATH/magiskinit copy /debug_ramdisk/magiskinit /dev/$MAGISK_TMP_PATH/magiskinit
chmod 0755 /dev/$MAGISK_TMP_PATH/magiskinit chmod 0755 /dev/$MAGISK_TMP_PATH/magiskinit
copy /sbin/magiskpolicy /dev/$MAGISK_TMP_PATH/magiskpolicy copy /debug_ramdisk/magiskpolicy /dev/$MAGISK_TMP_PATH/magiskpolicy
chmod 0755 /dev/$MAGISK_TMP_PATH/magiskpolicy chmod 0755 /dev/$MAGISK_TMP_PATH/magiskpolicy
mkdir /dev/$MAGISK_TMP_PATH/.magisk 755 mkdir /dev/$MAGISK_TMP_PATH/.magisk 755
mkdir /dev/$MAGISK_TMP_PATH/.magisk/mirror 0 mkdir /dev/$MAGISK_TMP_PATH/.magisk/mirror 0
mkdir /dev/$MAGISK_TMP_PATH/.magisk/block 0 mkdir /dev/$MAGISK_TMP_PATH/.magisk/block 0
mkdir /dev/$MAGISK_TMP_PATH/.magisk/worker 0 mkdir /dev/$MAGISK_TMP_PATH/.magisk/worker 0
copy /sbin/magisk.apk /dev/$MAGISK_TMP_PATH/stub.apk copy /debug_ramdisk/magisk.apk /dev/$MAGISK_TMP_PATH/stub.apk
chmod 0644 /dev/$MAGISK_TMP_PATH/stub.apk chmod 0644 /dev/$MAGISK_TMP_PATH/stub.apk
rm /dev/.magisk_unblock rm /dev/.magisk_unblock
exec_start $LOAD_POLICY_SVC_NAME exec_start $LOAD_POLICY_SVC_NAME
start $PFD_SVC_NAME start $PFD_SVC_NAME
@ -796,7 +796,7 @@ on post-fs-data
rm /dev/.magisk_unblock rm /dev/.magisk_unblock
exec u:r:magisk:s0 0 0 -- /system/bin/mknod -m 0600 /dev/$MAGISK_TMP_PATH/.magisk/block/preinit b 8 0 exec u:r:magisk:s0 0 0 -- /system/bin/mknod -m 0600 /dev/$MAGISK_TMP_PATH/.magisk/block/preinit b 8 0
service $LOAD_POLICY_SVC_NAME /system/bin/sh /sbin/loadpolicy.sh service $LOAD_POLICY_SVC_NAME /system/bin/sh /debug_ramdisk/loadpolicy.sh
user root user root
seclabel u:r:magisk:s0 seclabel u:r:magisk:s0
oneshot oneshot
@ -814,7 +814,7 @@ service $LS_SVC_NAME /dev/$MAGISK_TMP_PATH/magisk --service
on property:sys.boot_completed=1 on property:sys.boot_completed=1
mkdir /data/adb/magisk 755 mkdir /data/adb/magisk 755
copy /sbin/magisk.apk /data/adb/magisk/magisk.apk copy /debug_ramdisk/magisk.apk /data/adb/magisk/magisk.apk
exec /dev/$MAGISK_TMP_PATH/magisk --boot-complete exec /dev/$MAGISK_TMP_PATH/magisk --boot-complete
on property:init.svc.zygote=restarting on property:init.svc.zygote=restarting
@ -905,7 +905,7 @@ if [ "$GAPPS_BRAND" != 'none' ]; then
fi fi
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2304 ]]; then if [[ "$WSA_MAIN_VER" -ge 2304 ]]; then
echo "Create EROFS images" echo "Create EROFS images"
mk_erofs_umount "$VENDOR_MNT" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort mk_erofs_umount "$VENDOR_MNT" "$WORK_DIR/wsa/$ARCH/vendor.img" || abort
mk_erofs_umount "$PRODUCT_MNT" "$WORK_DIR/wsa/$ARCH/product.img" || abort mk_erofs_umount "$PRODUCT_MNT" "$WORK_DIR/wsa/$ARCH/product.img" || abort
@ -934,7 +934,7 @@ else
echo -e "Shrink images done\n" echo -e "Shrink images done\n"
fi fi
if [[ "$DOWN_WSA_MAIN_VERSION" -ge 2302 ]]; then if [[ "$WSA_MAIN_VER" -ge 2302 ]]; then
echo "Convert images to vhdx" echo "Convert images to vhdx"
qemu-img convert -q -f raw -o subformat=fixed -O vhdx "$WORK_DIR/wsa/$ARCH/system_ext.img" "$WORK_DIR/wsa/$ARCH/system_ext.vhdx" || abort qemu-img convert -q -f raw -o subformat=fixed -O vhdx "$WORK_DIR/wsa/$ARCH/system_ext.img" "$WORK_DIR/wsa/$ARCH/system_ext.vhdx" || abort
qemu-img convert -q -f raw -o subformat=fixed -O vhdx "$WORK_DIR/wsa/$ARCH/product.img" "$WORK_DIR/wsa/$ARCH/product.vhdx" || abort qemu-img convert -q -f raw -o subformat=fixed -O vhdx "$WORK_DIR/wsa/$ARCH/product.img" "$WORK_DIR/wsa/$ARCH/product.vhdx" || abort

24
scripts/extractMagisk.py
View File

@ -23,10 +23,11 @@ import zipfile
from pathlib import Path from pathlib import Path
import platform import platform
import os import os
from typing import OrderedDict from typing import Any, OrderedDict
class Prop(OrderedDict): class Prop(OrderedDict):
def __init__(self, props: str=...) -> None: def __init__(self, props: str = ...) -> None:
super().__init__() super().__init__()
for i, line in enumerate(props.splitlines(False)): for i, line in enumerate(props.splitlines(False)):
if '=' in line: if '=' in line:
@ -35,8 +36,12 @@ class Prop(OrderedDict):
else: else:
self[f".{i}"] = line self[f".{i}"] = line
def get(self, key: str) -> str: def __setattr__(self, __name: str, __value: Any) -> None:
return self[key] self[__name] = __value
def __repr__(self):
return '\n'.join(f'{item}={self[item]}' for item in self)
is_x86_64 = platform.machine() in ("AMD64", "x86_64") is_x86_64 = platform.machine() in ("AMD64", "x86_64")
host_abi = "x64" if is_x86_64 else "arm64" host_abi = "x64" if is_x86_64 else "arm64"
@ -48,19 +53,24 @@ if not Path(workdir).is_dir():
abi_map = {"x64": ["x86_64", "x86"], "arm64": ["arm64-v8a", "armeabi-v7a"]} abi_map = {"x64": ["x86_64", "x86"], "arm64": ["arm64-v8a", "armeabi-v7a"]}
def extract_as(zip, name, as_name, dir): def extract_as(zip, name, as_name, dir):
info = zip.getinfo(name) info = zip.getinfo(name)
info.filename = as_name info.filename = as_name
zip.extract(info, workdir / dir) zip.extract(info, workdir / dir)
with zipfile.ZipFile(magisk_zip) as zip: with zipfile.ZipFile(magisk_zip) as zip:
props = Prop(zip.comment.decode().replace('\000', '\n')) props = Prop(zip.comment.decode().replace('\000', '\n'))
versionName = props.get("version") versionName = props.get("version")
versionCode = props.get("versionCode") versionCode = props.get("versionCode")
print(f"Magisk version: {versionName} ({versionCode})", flush=True) print(f"Magisk version: {versionName} ({versionCode})", flush=True)
with open(os.environ['WSA_WORK_ENV'], 'a') as environ_file: with open(os.environ['WSA_WORK_ENV'], 'r') as environ_file:
environ_file.write(f'MAGISK_VERSION_NAME={versionName}\n') env = Prop(environ_file.read())
environ_file.write(f'MAGISK_VERSION_CODE={versionCode}\n') env.MAGISK_VERSION_NAME = versionName
env.MAGISK_VERSION_CODE = versionCode
with open(os.environ['WSA_WORK_ENV'], 'w') as environ_file:
environ_file.write(str(env))
extract_as( extract_as(
zip, f"lib/{ abi_map[arch][0] }/libmagisk64.so", "magisk64", "magisk") zip, f"lib/{ abi_map[arch][0] }/libmagisk64.so", "magisk64", "magisk")
extract_as( extract_as(

30
scripts/extractWSA.py
View File

@ -20,12 +20,31 @@
import os import os
import sys import sys
from typing import Any, OrderedDict
import zipfile import zipfile
from pathlib import Path from pathlib import Path
import re import re
import shutil import shutil
class Prop(OrderedDict):
def __init__(self, props: str = ...) -> None:
super().__init__()
for i, line in enumerate(props.splitlines(False)):
if '=' in line:
k, v = line.split('=', 1)
self[k] = v
else:
self[f".{i}"] = line
def __setattr__(self, __name: str, __value: Any) -> None:
self[__name] = __value
def __repr__(self):
return '\n'.join(f'{item}={self[item]}' for item in self)
arch = sys.argv[1] arch = sys.argv[1]
zip_name = "" zip_name = ""
@ -66,10 +85,13 @@ with zipfile.ZipFile(wsa_zip_path) as zip:
main_ver = ver[0] main_ver = ver[0]
rel = ver_no[3].split(".") rel = ver_no[3].split(".")
rel_long = str(rel[0]) rel_long = str(rel[0])
with open(env_file, 'a') as environ_file: with open(env_file, 'r') as environ_file:
environ_file.write(f'WSA_VER={long_ver}\n') env = Prop(environ_file.read())
environ_file.write(f'WSA_MAIN_VER={main_ver}\n') env.WSA_VER = long_ver
environ_file.write(f'WSA_REL={rel_long}\n') env.WSA_MAIN_VER = main_ver
env.WSA_REL = rel_long
with open(env_file, 'w') as environ_file:
environ_file.write(str(env))
filename_lower = f.filename.lower() filename_lower = f.filename.lower()
if 'language' in filename_lower or 'scale' in filename_lower: if 'language' in filename_lower or 'scale' in filename_lower:
name = f.filename.split("_")[2].split(".")[0] name = f.filename.split("_")[2].split(".")[0]

26
scripts/generateKernelSULink.py
View File

@ -21,12 +21,31 @@
from datetime import datetime from datetime import datetime
import sys import sys
import os import os
from typing import Any, OrderedDict
import requests import requests
import json import json
import re import re
from pathlib import Path from pathlib import Path
class Prop(OrderedDict):
def __init__(self, props: str = ...) -> None:
super().__init__()
for i, line in enumerate(props.splitlines(False)):
if '=' in line:
k, v = line.split('=', 1)
self[k] = v
else:
self[f".{i}"] = line
def __setattr__(self, __name: str, __value: Any) -> None:
self[__name] = __value
def __repr__(self):
return '\n'.join(f'{item}={self[item]}' for item in self)
arch = sys.argv[1] arch = sys.argv[1]
arg2 = sys.argv[2] arg2 = sys.argv[2]
download_dir = Path.cwd().parent / "download" if arg2 == "" else Path(arg2) download_dir = Path.cwd().parent / "download" if arg2 == "" else Path(arg2)
@ -50,8 +69,11 @@ if res.status_code == 200:
print(f"Error: No KernelSU release found for arch={abi_map[arch]}, kernel version={kernelVersion}", flush=True) print(f"Error: No KernelSU release found for arch={abi_map[arch]}, kernel version={kernelVersion}", flush=True)
exit(1) exit(1)
release_name = json_data["name"] release_name = json_data["name"]
with open(os.environ['WSA_WORK_ENV'], 'a') as environ_file: with open(os.environ['WSA_WORK_ENV'], 'r') as environ_file:
environ_file.write(f'KERNELSU_VER={release_name}\n') env = Prop(environ_file.read())
env.KERNELSU_VER = release_name
with open(os.environ['WSA_WORK_ENV'], 'w') as environ_file:
environ_file.write(str(env))
elif res.status_code == 403 and x_ratelimit_remaining == '0': elif res.status_code == 403 and x_ratelimit_remaining == '0':
message = json_data["message"] message = json_data["message"]
print(f"Github API Error: {message}", flush=True) print(f"Github API Error: {message}", flush=True)

18
scripts/generateWSALinks.py
View File

@ -26,7 +26,7 @@ import sys
from pathlib import Path from pathlib import Path
from threading import Thread from threading import Thread
from typing import OrderedDict from typing import Any, OrderedDict
from xml.dom import minidom from xml.dom import minidom
from requests import Session from requests import Session
@ -42,8 +42,11 @@ class Prop(OrderedDict):
else: else:
self[f".{i}"] = line self[f".{i}"] = line
def get(self, key: str) -> str: def __setattr__(self, __name: str, __value: Any) -> None:
return self[key] self[__name] = __value
def __repr__(self):
return '\n'.join(f'{item}={self[item]}' for item in self)
logging.captureWarnings(True) logging.captureWarnings(True)
@ -154,9 +157,12 @@ for filename, values in identities.items():
wsa_long_ver = re.search(u'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group() wsa_long_ver = re.search(u'\d{4}.\d{5}.\d{1,}.\d{1,}', filename).group()
print(f'WSA Version={wsa_long_ver}\n', flush=True) print(f'WSA Version={wsa_long_ver}\n', flush=True)
main_ver = wsa_long_ver.split(".")[0] main_ver = wsa_long_ver.split(".")[0]
with open(os.environ['WSA_WORK_ENV'], 'a') as environ_file: with open(os.environ['WSA_WORK_ENV'], 'r') as environ_file:
environ_file.write(f"DOWN_WSA_VERSION={wsa_long_ver}\n") env = Prop(environ_file.read())
environ_file.write(f"DOWN_WSA_MAIN_VERSION={main_ver}\n") env.WSA_VER = wsa_long_ver
env.WSA_MAIN_VER = main_ver
with open(os.environ['WSA_WORK_ENV'], 'w') as environ_file:
environ_file.write(str(env))
out_file_name = f"wsa-{release_type}.zip" out_file_name = f"wsa-{release_type}.zip"
out_file = download_dir / out_file_name out_file = download_dir / out_file_name
else: else: