mirror of
https://github.com/MustardChef/WSABuilds.git
synced 2024-11-30 15:14:14 +01:00
Minor Changes
This commit is contained in:
parent
f6a348a596
commit
38373a5945
@ -36,7 +36,6 @@ release_type_map = {"retail": "Retail", "release preview": "RP",
|
|||||||
"insider slow": "WIS", "insider fast": "WIF"}
|
"insider slow": "WIS", "insider fast": "WIF"}
|
||||||
release_type = release_type_map[sys.argv[2]] if sys.argv[2] != "" else "Retail"
|
release_type = release_type_map[sys.argv[2]] if sys.argv[2] != "" else "Retail"
|
||||||
download_dir = Path.cwd().parent / "download" if sys.argv[3] == "" else Path(sys.argv[3]).resolve()
|
download_dir = Path.cwd().parent / "download" if sys.argv[3] == "" else Path(sys.argv[3]).resolve()
|
||||||
download_dir
|
|
||||||
tempScript = sys.argv[4]
|
tempScript = sys.argv[4]
|
||||||
cat_id = '858014f3-3934-4abe-8078-4aa193e74ca8'
|
cat_id = '858014f3-3934-4abe-8078-4aa193e74ca8'
|
||||||
print(f"Generating WSA download link: arch={arch} release_type={release_type}", flush=True)
|
print(f"Generating WSA download link: arch={arch} release_type={release_type}", flush=True)
|
||||||
|
@ -34,6 +34,9 @@ DOWNLOAD_DIR=../download
|
|||||||
DOWNLOAD_CONF_NAME=download.list
|
DOWNLOAD_CONF_NAME=download.list
|
||||||
OUTPUT_DIR=../output
|
OUTPUT_DIR=../output
|
||||||
MOUNT_DIR="$WORK_DIR"/system
|
MOUNT_DIR="$WORK_DIR"/system
|
||||||
|
CLEAN_DOWNLOAD_WSA=0
|
||||||
|
CLEAN_DOWNLOAD_MAGISK=0
|
||||||
|
CLEAN_DOWNLOAD_GAPPS=0
|
||||||
umount_clean(){
|
umount_clean(){
|
||||||
echo "Cleanup Work Directory"
|
echo "Cleanup Work Directory"
|
||||||
if [ -d "$MOUNT_DIR" ]; then
|
if [ -d "$MOUNT_DIR" ]; then
|
||||||
@ -240,12 +243,12 @@ if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; then
|
|||||||
if [ $GAPPS_BRAND = "OpenGApps" ]; then
|
if [ $GAPPS_BRAND = "OpenGApps" ]; then
|
||||||
if [ -f "$GAPPS_PATH" ]; then
|
if [ -f "$GAPPS_PATH" ]; then
|
||||||
if ! unzip -p "$GAPPS_PATH" {Core,GApps}/'*.lz' | tar --lzip -C "$WORK_DIR"/gapps -xf - -i --strip-components=2 --exclude='setupwizardtablet-x86_64' --exclude='packageinstallergoogle-all' --exclude='speech-common' --exclude='markup-lib-arm' --exclude='markup-lib-arm64' --exclude='markup-all' --exclude='setupwizarddefault-x86_64' --exclude='pixellauncher-all' --exclude='pixellauncher-common'; then
|
if ! unzip -p "$GAPPS_PATH" {Core,GApps}/'*.lz' | tar --lzip -C "$WORK_DIR"/gapps -xf - -i --strip-components=2 --exclude='setupwizardtablet-x86_64' --exclude='packageinstallergoogle-all' --exclude='speech-common' --exclude='markup-lib-arm' --exclude='markup-lib-arm64' --exclude='markup-all' --exclude='setupwizarddefault-x86_64' --exclude='pixellauncher-all' --exclude='pixellauncher-common'; then
|
||||||
echo "Unzip GApps failed, is the download incomplete?"
|
echo "Unzip OpenGApps failed, is the download incomplete?"
|
||||||
CLEAN_DOWNLOAD_GAPPS=1
|
CLEAN_DOWNLOAD_GAPPS=1
|
||||||
abort
|
abort
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "The WSA zip package does not exist, is the download incomplete?"
|
echo "The OpenGApps zip package does not exist, is the download incomplete?"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user