Merge branch 'main' into sys_patch-refactor

CHANGELOG.md

@@ -1,6 +1,10 @@
 # OpenCore Legacy Patcher changelog
 
 ## 0.4.5
+- Fix AutoPatcher.pkg download on releases
+  - Fix backported to 0.4.4 release binaries
+- Add Macmini8,1 FeatureUnlock support
+  - Drops CPU check, supports all machines
 - Refactor Root Patching System
 
 ## 0.4.4

gui/gui_main.py

@@ -1581,10 +1581,16 @@ class wx_python_gui:
                 print("- Nightly Install.pkg is missing on Github, exiting")
                 return
 
-        if utilities.download_file(link, self.constants.installer_pkg_zip_path):
+        if link.endswith(".zip"):
-            if Path(self.constants.installer_pkg_path).exists():
+            path = self.constants.installer_pkg_zip_path
-                subprocess.run(["rm", self.constants.installer_pkg_path])
+        else:
-            subprocess.run(["ditto", "-V", "-x", "-k", "--sequesterRsrc", "--rsrc", self.constants.installer_pkg_zip_path, self.constants.payload_path])
+            path = self.constants.installer_pkg_path
+
+        if utilities.download_file(link, path):
+            if str(path).endswith(".zip"):
+                if Path(self.constants.installer_pkg_path).exists():
+                    subprocess.run(["rm", self.constants.installer_pkg_path])
+                subprocess.run(["ditto", "-V", "-x", "-k", "--sequesterRsrc", "--rsrc", self.constants.installer_pkg_zip_path, self.constants.payload_path])
 
     def install_installer_pkg(self, disk):
         disk = disk + "s2" # ESP sits at 1, and we know macOS will have created the main partition at 2

resources/build.py

@@ -166,13 +166,12 @@ class BuildOpenCore:
             # Required for Lilu in 11.0+
             self.config["Kernel"]["Quirks"]["DisableLinkeditJettison"] = True
         
-        if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.kaby_lake.value:
+        if self.constants.fu_status is True:
-            if self.constants.fu_status is True:
+            # Enable FeatureUnlock.kext
-                # Enable FeatureUnlock.kext
+            self.enable_kext("FeatureUnlock.kext", self.constants.featureunlock_version, self.constants.featureunlock_path)
-                self.enable_kext("FeatureUnlock.kext", self.constants.featureunlock_version, self.constants.featureunlock_path)
+            if self.constants.fu_arguments is not None:
-                if self.constants.fu_arguments is not None:
+                print(f"- Adding additional FeatureUnlock args: {self.constants.fu_arguments}")
-                    print(f"- Adding additional FeatureUnlock args: {self.constants.fu_arguments}")
+                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += self.constants.fu_arguments
-                    self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += self.constants.fu_arguments
         
         if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value or self.constants.disable_xcpm is True:
             # With macOS 12.3 Beta 1, Apple dropped the 'plugin-type' check within X86PlatformPlugin

resources/constants.py

@@ -23,7 +23,7 @@ class Constants:
         self.repo_link = "https://github.com/dortania/OpenCore-Legacy-Patcher"
         self.repo_link_latest = f"{self.repo_link}/releases/tag/{self.patcher_version}"
         self.copyright_date = "Copyright © 2020-2022 Dortania"
-        self.installer_pkg_url = f"{self.repo_link_latest}/AutoPkg-Assets.pkg.zip"
+        self.installer_pkg_url = f"{self.repo_link}/releases/download/{self.patcher_version}/AutoPkg-Assets.pkg"
         self.installer_pkg_url_nightly = "http://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-wxpython/main/AutoPkg-Assets.pkg.zip"
 
         # OpenCore Versioning