diff --git a/Resources/SysPatch.py b/Resources/SysPatch.py index bbc6e62af..0f421bce9 100644 --- a/Resources/SysPatch.py +++ b/Resources/SysPatch.py @@ -5,9 +5,9 @@ # - Temporary Work-around: sudo bless --mount /System/Volumes/Update/mnt1 --bootefi --last-sealed-snapshot # - Work-around battery throttling on laptops with no battery (IOPlatformPluginFamily.kext/Contents/PlugIns/ACPI_SMC_PlatformPlugin.kext/Contents/Resources/) -import hashlib +#import hashlib import os -import requests +#mport requests import shutil import subprocess import zipfile @@ -338,22 +338,35 @@ class PatchSysVolume: print("- Removing old Apple Binaries zip") Path(self.constants.payload_apple_root_path_zip).unlink() - response = requests.get(link, stream=True) - with self.constants.payload_apple_root_path_zip.open("wb") as file: - count = 0 - for chunk in response.iter_content(1024 * 1024 * 4): - file.write(chunk) - count += len(chunk) - Utilities.cls() - print(f"- Downloading Apple binaries ({os_ver}) from PatcherSupportPkg") - print(f"- {count / 1024 / 1024}MB Downloaded") - checksum = hashlib.sha256() - with self.constants.payload_apple_root_path_zip.open("rb") as file: - chunk = file.read(1024 * 1024 * 16) - while chunk: - checksum.update(chunk) - chunk = file.read(1024 * 1024 * 16) - print(f"- Checksum: {checksum.hexdigest()}") + Utilities.cls() + print("- Downloading Apple binaries") + popen_oclp = subprocess.Popen( + ["curl", "-S", "-L", link, "--output", self.constants.payload_apple_root_path_zip], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True, + ) + for stdout_line in iter(popen_oclp.stdout.readline, ""): + print(stdout_line, end="") + popen_oclp.stdout.close() + + #response = requests.get(link, stream=True) + #with self.constants.payload_apple_root_path_zip.open("wb") as file: + # count = 0 + # for chunk in response.iter_content(1024 * 1024 * 4): + # file.write(chunk) + # count += len(chunk) + # Utilities.cls() + # print(f"- Downloading Apple binaries ({os_ver}) from PatcherSupportPkg") + # print(f"- {count / 1024 / 1024}MB Downloaded") + #checksum = hashlib.sha256() + #with self.constants.payload_apple_root_path_zip.open("rb") as file: + # chunk = file.read(1024 * 1024 * 16) + # while chunk: + # checksum.update(chunk) + # chunk = file.read(1024 * 1024 * 16) + #print(f"- Checksum: {checksum.hexdigest()}") if self.constants.payload_apple_root_path_zip.exists(): print("- Download completed") print("- Unzipping download...") diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist index 62dd24566..9a67883cf 100644 --- a/payloads/Config/config.plist +++ b/payloads/Config/config.plist @@ -1231,8 +1231,6 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 - SystemAudioVolume - Rg== boot-args keepsyms=1 debug=0x100 -lilubetaall csr-active-config