gui_main.py: Add popup on OpenCore Build

resources/build.py

@@ -867,7 +867,7 @@ class BuildOpenCore:
             print("- Adding ipc_control_port_options=0 to boot-args")
             self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " ipc_control_port_options=0"
             # Adds AutoPkgInstaller for Automatic OpenCore-Patcher installation
-            # Only install if running the GUI (OCLP-Install.pkg requires the GUI)
+            # Only install if running the GUI (AutoPkg-Assets.pkg requires the GUI)
             if self.constants.wxpython_variant is True:
                 self.enable_kext("AutoPkgInstaller.kext", self.constants.autopkg_version, self.constants.autopkg_path)
             if self.constants.custom_sip_value:

resources/constants.py

@@ -23,8 +23,8 @@ 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}/OCLP-Install.pkg.zip"
-        self.installer_pkg_url_nightly = "http://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-wxpython-offline/main/OCLP-Install.pkg.zip"
+        self.installer_pkg_url = f"{self.repo_link_latest}/AutoPkg-Assets.pkg.zip"
+        self.installer_pkg_url_nightly = "http://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-wxpython-offline/main/AutoPkg-Assets.pkg.zip"
 
         # OpenCore Versioning
         # https://github.com/acidanthera/OpenCorePkg
@@ -565,11 +565,11 @@ class Constants:
 
     @property
     def installer_pkg_path(self):
-        return self.payload_path / Path("OCLP-Install.pkg")
+        return self.payload_path / Path("AutoPkg-Assets.pkg")
     
     @property
     def installer_pkg_zip_path(self):
-        return self.payload_path / Path("OCLP-Install.pkg.zip")
+        return self.payload_path / Path("AutoPkg-Assets.pkg.zip")
 
     # Apple Payloads Paths
 

resources/utilities.py

@@ -102,18 +102,24 @@ def check_seal():
         return False
 
 
-def csr_decode(os_sip):
+def csr_dump():
     # Based off sip_config.py
     # https://gist.github.com/pudquick/8b320be960e1654b908b10346272326b
     # https://opensource.apple.com/source/xnu/xnu-7195.141.2/libsyscall/wrappers/csr.c.auto.html
-    # Far more reliable than parsing csr-active-config
+    # Far more reliable than parsing NVRAM's csr-active-config (ie. user can wipe it, boot.efi can strip bits)
 
     # Note that 'csr_get_active_config' was not introduced until 10.11
-    # However this function should never be called on 10.10 or earlier
-    libsys = CDLL('/usr/lib/libSystem.dylib')
-    raw    = c_uint(0)
-    errmsg = libsys.csr_get_active_config(byref(raw))
-    sip_int = raw.value
+    try:
+        libsys = CDLL('/usr/lib/libSystem.dylib')
+        raw    = c_uint(0)
+        errmsg = libsys.csr_get_active_config(byref(raw))
+        return raw.value
+    except AttributeError:
+        return 0
+
+
+def csr_decode(os_sip):
+    sip_int = csr_dump()
     for i,  current_sip_bit in enumerate(sip_data.system_integrity_protection.csr_values):
         if sip_int & (1 << i):
             sip_data.system_integrity_protection.csr_values[current_sip_bit] = True