diff --git a/OcBinaryData/Resources/Font/Font_1x.bin b/OcBinaryData/Resources/Font/Font_1x.bin deleted file mode 100755 index a4ef287..0000000 Binary files a/OcBinaryData/Resources/Font/Font_1x.bin and /dev/null differ diff --git a/OcBinaryData/Resources/Font/Font_1x.png b/OcBinaryData/Resources/Font/Font_1x.png deleted file mode 100755 index 3b5f3ef..0000000 Binary files a/OcBinaryData/Resources/Font/Font_1x.png and /dev/null differ diff --git a/OcBinaryData/Resources/Font/Font_2x.bin b/OcBinaryData/Resources/Font/Font_2x.bin deleted file mode 100755 index 714ace8..0000000 Binary files a/OcBinaryData/Resources/Font/Font_2x.bin and /dev/null differ diff --git a/OcBinaryData/Resources/Font/Font_2x.png b/OcBinaryData/Resources/Font/Font_2x.png deleted file mode 100755 index a06e748..0000000 Binary files a/OcBinaryData/Resources/Font/Font_2x.png and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/AppleRecv.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/AppleRecv.icns deleted file mode 100755 index 54b49c9..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/AppleRecv.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/AppleTM.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/AppleTM.icns deleted file mode 100755 index 7acb4f3..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/AppleTM.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/BtnFocus.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/BtnFocus.icns deleted file mode 100755 index 1627a67..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/BtnFocus.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Cursor.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Cursor.icns deleted file mode 100755 index e84f198..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Cursor.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Dot.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Dot.icns deleted file mode 100755 index 60a4c41..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Dot.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Enter.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Enter.icns deleted file mode 100755 index 087d050..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Enter.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtAppleRecv.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtAppleRecv.icns deleted file mode 100755 index 2ec68de..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtAppleRecv.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtAppleTM.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtAppleTM.icns deleted file mode 100755 index ec13a62..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtAppleTM.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtHardDrive.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtHardDrive.icns deleted file mode 100755 index 890d769..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ExtHardDrive.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/HardDrive.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/HardDrive.icns deleted file mode 100755 index ec8343f..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/HardDrive.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Left.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Left.icns deleted file mode 100755 index e3a2313..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Left.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Lock.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Lock.icns deleted file mode 100755 index 499b103..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Lock.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Password.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Password.icns deleted file mode 100755 index 7a5c2c8..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Password.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Restart.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Restart.icns deleted file mode 100755 index 6bc45b2..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Restart.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Right.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Right.icns deleted file mode 100755 index 537a1e2..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Right.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Selected.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Selected.icns deleted file mode 100755 index 8f59155..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Selected.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Selector.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Selector.icns deleted file mode 100755 index 44c81a5..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Selector.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/SetDefault.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/SetDefault.icns deleted file mode 100755 index faa5807..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/SetDefault.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Shell.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Shell.icns deleted file mode 100755 index 2e453d6..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Shell.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ShutDown.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ShutDown.icns deleted file mode 100755 index ee11240..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/ShutDown.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Tool.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Tool.icns deleted file mode 100755 index d8e13fd..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Tool.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Windows.icns b/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Windows.icns deleted file mode 100755 index cc9e1ad..0000000 Binary files a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Windows.icns and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Apple.l2x b/OcBinaryData/Resources/Label/Apple.l2x deleted file mode 100755 index d347265..0000000 Binary files a/OcBinaryData/Resources/Label/Apple.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Apple.lbl b/OcBinaryData/Resources/Label/Apple.lbl deleted file mode 100755 index 5303b1c..0000000 Binary files a/OcBinaryData/Resources/Label/Apple.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/AppleRecv.l2x b/OcBinaryData/Resources/Label/AppleRecv.l2x deleted file mode 100755 index 9708b38..0000000 Binary files a/OcBinaryData/Resources/Label/AppleRecv.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/AppleRecv.lbl b/OcBinaryData/Resources/Label/AppleRecv.lbl deleted file mode 100755 index d11eee3..0000000 Binary files a/OcBinaryData/Resources/Label/AppleRecv.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/AppleTM.l2x b/OcBinaryData/Resources/Label/AppleTM.l2x deleted file mode 100755 index cf3cdd3..0000000 Binary files a/OcBinaryData/Resources/Label/AppleTM.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/AppleTM.lbl b/OcBinaryData/Resources/Label/AppleTM.lbl deleted file mode 100755 index 887aa26..0000000 Binary files a/OcBinaryData/Resources/Label/AppleTM.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/EFIBoot.l2x b/OcBinaryData/Resources/Label/EFIBoot.l2x deleted file mode 100755 index 6fe1655..0000000 Binary files a/OcBinaryData/Resources/Label/EFIBoot.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/EFIBoot.lbl b/OcBinaryData/Resources/Label/EFIBoot.lbl deleted file mode 100755 index 28f1a31..0000000 Binary files a/OcBinaryData/Resources/Label/EFIBoot.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Other.l2x b/OcBinaryData/Resources/Label/Other.l2x deleted file mode 100755 index ee05430..0000000 Binary files a/OcBinaryData/Resources/Label/Other.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Other.lbl b/OcBinaryData/Resources/Label/Other.lbl deleted file mode 100755 index be76830..0000000 Binary files a/OcBinaryData/Resources/Label/Other.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/ResetNVRAM.l2x b/OcBinaryData/Resources/Label/ResetNVRAM.l2x deleted file mode 100755 index 37c9425..0000000 Binary files a/OcBinaryData/Resources/Label/ResetNVRAM.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/ResetNVRAM.lbl b/OcBinaryData/Resources/Label/ResetNVRAM.lbl deleted file mode 100755 index d64bd59..0000000 Binary files a/OcBinaryData/Resources/Label/ResetNVRAM.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/SIPDisabled.l2x b/OcBinaryData/Resources/Label/SIPDisabled.l2x deleted file mode 100755 index 73293ba..0000000 Binary files a/OcBinaryData/Resources/Label/SIPDisabled.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/SIPDisabled.lbl b/OcBinaryData/Resources/Label/SIPDisabled.lbl deleted file mode 100755 index 6a16cf9..0000000 Binary files a/OcBinaryData/Resources/Label/SIPDisabled.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/SIPEnabled.l2x b/OcBinaryData/Resources/Label/SIPEnabled.l2x deleted file mode 100755 index 41faffa..0000000 Binary files a/OcBinaryData/Resources/Label/SIPEnabled.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/SIPEnabled.lbl b/OcBinaryData/Resources/Label/SIPEnabled.lbl deleted file mode 100755 index c943e6a..0000000 Binary files a/OcBinaryData/Resources/Label/SIPEnabled.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Shell.l2x b/OcBinaryData/Resources/Label/Shell.l2x deleted file mode 100755 index 4193b25..0000000 Binary files a/OcBinaryData/Resources/Label/Shell.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Shell.lbl b/OcBinaryData/Resources/Label/Shell.lbl deleted file mode 100755 index 06dc4ac..0000000 Binary files a/OcBinaryData/Resources/Label/Shell.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Tool.l2x b/OcBinaryData/Resources/Label/Tool.l2x deleted file mode 100755 index 9eb557a..0000000 Binary files a/OcBinaryData/Resources/Label/Tool.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Tool.lbl b/OcBinaryData/Resources/Label/Tool.lbl deleted file mode 100755 index 4ca11ce..0000000 Binary files a/OcBinaryData/Resources/Label/Tool.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Windows.l2x b/OcBinaryData/Resources/Label/Windows.l2x deleted file mode 100755 index 87b014e..0000000 Binary files a/OcBinaryData/Resources/Label/Windows.l2x and /dev/null differ diff --git a/OcBinaryData/Resources/Label/Windows.lbl b/OcBinaryData/Resources/Label/Windows.lbl deleted file mode 100755 index be97d86..0000000 Binary files a/OcBinaryData/Resources/Label/Windows.lbl and /dev/null differ diff --git a/OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Background.icns b/Scripts/datasets/background_picker.icns old mode 100755 new mode 100644 similarity index 100% rename from OcBinaryData/Resources/Image/Acidanthera/GoldenGate/Background.icns rename to Scripts/datasets/background_picker.icns diff --git a/Scripts/gathering_files.py b/Scripts/gathering_files.py index 9cb890d..6ef5473 100644 --- a/Scripts/gathering_files.py +++ b/Scripts/gathering_files.py @@ -13,6 +13,7 @@ class gatheringFiles: self.github = github.Github() self.fetcher = resource_fetcher.ResourceFetcher() self.dortania_builds_url = "https://raw.githubusercontent.com/dortania/build-repo/builds/latest.json" + self.ocbinarydata_url = "https://github.com/acidanthera/OcBinaryData/archive/refs/heads/master.zip" self.amd_vanilla_patches_url = "https://raw.githubusercontent.com/AMD-OSX/AMD_Vanilla/beta/patches.plist" self.temporary_dir = tempfile.mkdtemp() self.ock_files_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "OCK_Files") @@ -94,6 +95,20 @@ class gatheringFiles: source_config_path = os.path.join(os.path.dirname(os.path.dirname(source_bootloader_path)), "Docs", "Sample.plist") destination_config_path = os.path.join(destination_efi_path, "OC", "config.plist") shutil.move(source_config_path, destination_config_path) + + ocbinarydata_dir = os.path.join(self.temporary_dir, "OcBinaryData", "OcBinaryData-master") + background_picker_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "datasets", "background_picker.icns") + if os.path.exists(ocbinarydata_dir): + for name in os.listdir(ocbinarydata_dir): + if name.startswith("."): + continue + shutil.copytree(os.path.join(ocbinarydata_dir, name), os.path.join(destination_efi_path, "OC", name), dirs_exist_ok=True) + resources_image_dir = os.path.join(destination_efi_path, "OC", "Resources", "Image") + picker_variants = self.utils.find_matching_paths(resources_image_dir, type_filter="dir") + for picker_variant, type in picker_variants: + if ".icns" in ", ".join(os.listdir(os.path.join(resources_image_dir, picker_variant))): + shutil.copy(background_picker_path, os.path.join(resources_image_dir, picker_variant, "Background.icns")) + macserial_paths = self.utils.find_matching_paths(os.path.join(self.temporary_dir, product_name), name_filter="macserial", type_filter="file") if macserial_paths: for macserial_path, type in macserial_paths: @@ -127,6 +142,13 @@ class gatheringFiles: self.fetcher.download_and_save_file(product.get("url"), zip_path) self.utils.extract_zip_file(zip_path) + if "OpenCore" in product.get("product_name"): + ocbinarydata_dir = os.path.join(self.temporary_dir, "OcBinaryData") + if not os.path.exists(ocbinarydata_dir): + zip_path = ocbinarydata_dir + ".zip" + self.fetcher.download_and_save_file(self.ocbinarydata_url, zip_path) + self.utils.extract_zip_file(zip_path) + if self.move_bootloader_kexts_to_product_directory(product.get("product_name")): if product_index is None: download_history.append({