diff --git a/OpCore-Simplify.py b/OpCore-Simplify.py index ed34b97..2bb6b73 100644 --- a/OpCore-Simplify.py +++ b/OpCore-Simplify.py @@ -29,7 +29,7 @@ class OCPE: def gathering_files(self, macos_version): self.u.head("Gathering Files") print("") - print("Please wait for download OpenCore NO ACPI, kexts and macserial...") + print("Please wait for download OpenCorePkg, kexts and macserial...") print("") self.o.get_bootloader_kexts_data(self.k.kexts) @@ -91,7 +91,7 @@ class OCPE: if not os.path.exists(self.k.ock_files_dir): raise Exception("Directory '{}' does not exist.".format(self.k.ock_files_dir)) - source_efi_dir = os.path.join(self.k.ock_files_dir, "OpenCore") + source_efi_dir = os.path.join(self.k.ock_files_dir, "OpenCorePkg") shutil.copytree(source_efi_dir, self.result_dir, dirs_exist_ok=True) print("Done") print("2. Generate config.plist...", end=" ") diff --git a/README.md b/README.md index 80100eb..d82e076 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ ## ✨ **Features** -1. **Automatic Updates**: Automatically check and update AMD Vanilla Patches, OpenCore NO ACPI, and kexts. +1. **Automatic Updates**: Automatically check and update OpenCorePkg, kexts and AMD Vanilla Patches. 2. **Hardware Information Gathering**: Leverages the [Hardware Sniffer](https://github.com/lzhoang2801/Hardware-Sniffer) tool to gather detailed hardware information. It uses USB ID and PCI ID databases to ensure precise hardware compatibility checks. diff --git a/Scripts/gathering_files.py b/Scripts/gathering_files.py index 29cb72e..ac01224 100644 --- a/Scripts/gathering_files.py +++ b/Scripts/gathering_files.py @@ -65,8 +65,11 @@ class gatheringFiles: if self.github.check_ratelimit(): add_product_to_download_urls(self.github.get_latest_release(kext.github_repo.get("owner"), kext.github_repo.get("repo"))) - if self.github.check_ratelimit(): - add_product_to_download_urls(self.github.get_latest_release("wjz304", "OpenCore_Patch_Build")) + add_product_to_download_urls({ + "product_name": "OpenCorePkg", + "id": dortania_builds_data["OpenCorePkg"]["versions"][0]["release"]["id"], + "url": dortania_builds_data["OpenCorePkg"]["versions"][0]["links"]["release"] + }) sorted_download_urls = sorted(download_urls, key=lambda x:x["product_name"]) @@ -137,7 +140,7 @@ class gatheringFiles: self.utils.create_folder(self.temporary_dir) - for product in kexts + [{"Name": "OpenCore"}]: + for product in kexts + [{"Name": "OpenCorePkg"}]: if not isinstance(product, dict) and not product.checked: continue diff --git a/Scripts/smbios.py b/Scripts/smbios.py old mode 100755 new mode 100644 index 10e6469..ce5f7b2 --- a/Scripts/smbios.py +++ b/Scripts/smbios.py @@ -22,13 +22,17 @@ class SMBIOS: download_history = self.utils.read_file(self.g.download_history_file) if download_history: - product_index = self.g.get_product_index(download_history, "OpenCore") + product_index = self.g.get_product_index(download_history, "OpenCorePkg") if product_index: download_history.pop(product_index) self.utils.write_file(self.g.download_history_file, download_history) - raise Exception("{} not found. Please reopen the program to download it".format(macserial_name)) + print("\n") + print("{} not found. Please reopen the program to download it".format(macserial_name)) + print("") + self.utils.request_input() + self.utils.exit_program() return macserial_path