Add safe guards for logging

Oclp debug image

.github/workflows/build-app-wxpython.yml

@@ -9,24 +9,49 @@ on:
 jobs:
   build:
     name: Build wxPython
-    runs-on: x86_64_mojave
+    runs-on: x86_64_monterey
     if: github.repository_owner == 'dortania'
 
     env:
       branch: ${{ github.ref }}
       commiturl: ${{ github.event.head_commit.url }}${{ github.event.release.html_url }}
       commitdate: ${{ github.event.head_commit.timestamp }}${{ github.event.release.published_at }}
+      MAC_CODESIGN_IDENTITY: ${{ secrets.MAC_CODESIGN_IDENTITY }}
+      MAC_CODESIGN_CERT: ${{ secrets.MAC_CODESIGN_CERT }}
       MAC_NOTARIZATION_USERNAME: ${{ secrets.MAC_NOTARIZATION_USERNAME }}
       MAC_NOTARIZATION_PASSWORD: ${{ secrets.MAC_NOTARIZATION_PASSWORD }}
+      MAC_NOTARIZATION_TEAM_ID: ${{ secrets.MAC_NOTARIZATION_TEAM_ID }}
+      ANALYTICS_KEY: ${{ secrets.ANALYTICS_KEY }}
+      ANALYTICS_SITE: ${{ secrets.ANALYTICS_SITE }}
 
     steps:
       - uses: actions/checkout@v3
-      - run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}"
-      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
-      - run: cd dist; ditto -c -k --sequesterRsrc --keepParent OpenCore-Patcher.app ../OpenCore-Patcher-wxPython.app.zip
-      - run: xcrun altool --notarize-app --primary-bundle-id "com.dortania.opencore-legacy-patcher" --username "${{ env.MAC_NOTARIZATION_USERNAME }}" --password "${{ env.MAC_NOTARIZATION_PASSWORD }}" --file OpenCore-Patcher-wxPython.app.zip
-      - run: packagesbuild ./payloads/InstallPackage/AutoPkg-Assets-Setup.pkgproj
-      - run: mv ./OpenCore-Patcher-wxPython.app.zip ./OpenCore-Patcher-GUI.app.zip
+
+      - name: Build Binary
+        run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}" --key "${{ env.ANALYTICS_KEY }}" --site "${{ env.ANALYTICS_SITE }}"
+
+      # - name: Import Certificate
+      #   if: (!security find-certificate -c "${{ env.MAC_CODESIGN_IDENTITY }}")
+      #   uses: apple-actions/import-codesign-certs@v2
+      #   with:
+      #     p12-file-base64: ${{ secrets.MAC_CODESIGN_CERT }}
+      #     p12-password: ${{ secrets.MAC_NOTARIZATION_PASSWORD }}
+
+      - name: Codesign Binary
+        run: 'codesign -s "${{ env.MAC_CODESIGN_IDENTITY }}" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
+
+      - name: Package Binary
+        run: cd dist; ditto -c -k --sequesterRsrc --keepParent OpenCore-Patcher.app ../OpenCore-Patcher-wxPython.app.zip
+
+      - name: Notarize Binary
+        run: xcrun notarytool submit OpenCore-Patcher-wxPython.app.zip --apple-id "${{ env.MAC_NOTARIZATION_USERNAME }}" --password "${{ env.MAC_NOTARIZATION_PASSWORD }}" --team-id "${{ env.MAC_NOTARIZATION_TEAM_ID }}"
+
+      - name: Generate support package
+        run: packagesbuild ./payloads/InstallPackage/AutoPkg-Assets-Setup.pkgproj
+
+      - name: Prepare App for Upload
+        run: mv ./OpenCore-Patcher-wxPython.app.zip ./OpenCore-Patcher-GUI.app.zip
+
       - name: Upload App to Artifacts
         uses: actions/upload-artifact@v3
         with:

.github/workflows/validate-external.yml

@@ -0,0 +1,23 @@
+name: CI - Validation (External)
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Validate
+    runs-on: macos-latest
+    if: github.repository_owner != 'dortania'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.10'
+      - name: Install Dependencies
+        run: python3 -m pip install -r requirements.txt
+      - name: Validate
+        run: python3 OpenCore-Patcher-GUI.command --validate

.github/workflows/validate.yml

@@ -9,12 +9,9 @@ on:
 jobs:
   build:
     name: Validate
-    runs-on: x86_64_mojave
+    runs-on: x86_64_monterey
     if: github.repository_owner == 'dortania'
-    env:
-      branch: ${{ github.ref }}
-      commiturl: ${{ github.event.head_commit.url }}${{ github.event.release.html_url }}
-      commitdate: ${{ github.event.head_commit.timestamp }}${{ github.event.release.published_at }}
     steps:
       - uses: actions/checkout@v3
-      - run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 OpenCore-Patcher-GUI.command --validate
+      - name: Validate
+        run: /Library/Frameworks/Python.framework/Versions/3.10/bin/python3 OpenCore-Patcher-GUI.command --validate

.gitignore

@@ -33,3 +33,7 @@ __pycache__/
 /payloads/OpenCore-Legacy-Patcher-*.plist
 /payloads/KDK.dmg
 *.log
+/Universal-Binaries.dmg
+/payloads/KDKInfo.plist
+/payloads/update.sh
+/payloads/OpenCore-Patcher.app

Build-Binary.command

@@ -30,7 +30,7 @@ class CreateBinary:
 
     def __init__(self):
         start = time.time()
-        print("- Starting build script")
+        print("Starting build script")
 
         self.args = self._parse_arguments()
 
@@ -39,7 +39,7 @@ class CreateBinary:
         self._preflight_processes()
         self._build_binary()
         self._postflight_processes()
-        print(f"- Build script completed in {str(round(time.time() - start, 2))} seconds")
+        print(f"Build script completed in {str(round(time.time() - start, 2))} seconds")
 
 
     def _set_cwd(self):
@@ -48,7 +48,7 @@ class CreateBinary:
         """
 
         os.chdir(Path(__file__).resolve().parent)
-        print(f"- Current Working Directory: \n\t{os.getcwd()}")
+        print(f"Current Working Directory:\n- {os.getcwd()}")
 
 
     def _parse_arguments(self):
@@ -61,6 +61,8 @@ class CreateBinary:
         parser.add_argument('--commit', type=str, help='Git commit URL')
         parser.add_argument('--commit_date', type=str, help='Git commit date')
         parser.add_argument('--reset_binaries', action='store_true', help='Force redownload and imaging of payloads')
+        parser.add_argument('--key', type=str, help='Developer key for signing')
+        parser.add_argument('--site', type=str, help='Path to server')
         args = parser.parse_args()
         return args
 
@@ -86,7 +88,7 @@ class CreateBinary:
             pyinstaller_path = f"{python_bin_dir}pyinstaller"
 
         if not Path(pyinstaller_path).exists():
-            print(f"  - pyinstaller not found:\n\t{pyinstaller_path}")
+            print(f"- pyinstaller not found:\n\t{pyinstaller_path}")
             raise Exception("pyinstaller not found")
 
         self.pyinstaller_path = pyinstaller_path
@@ -97,7 +99,7 @@ class CreateBinary:
         Start preflight processes
         """
 
-        print("- Starting preflight processes")
+        print("Starting preflight processes")
         self._setup_pathing()
         self._delete_extra_binaries()
         self._download_resources()
@@ -109,7 +111,7 @@ class CreateBinary:
         Start postflight processes
         """
 
-        print("- Starting postflight processes")
+        print("Starting postflight processes")
         self._patch_load_command()
         self._add_commit_data()
         self._post_flight_cleanup()
@@ -122,26 +124,102 @@ class CreateBinary:
         """
 
         if Path(f"./dist/OpenCore-Patcher.app").exists():
-            print("- Found OpenCore-Patcher.app, removing...")
+            print("Found OpenCore-Patcher.app, removing...")
             rm_output = subprocess.run(
                 ["rm", "-rf", "./dist/OpenCore-Patcher.app"],
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE
             )
             if rm_output.returncode != 0:
-                print("- Remove failed")
+                print("Remove failed")
                 print(rm_output.stderr.decode('utf-8'))
                 raise Exception("Remove failed")
 
+        self._embed_key()
 
-        print("- Building GUI binary...")
+        print("Building GUI binary...")
         build_args = [self.pyinstaller_path, "./OpenCore-Patcher-GUI.spec", "--noconfirm"]
 
         build_result = subprocess.run(build_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        self._strip_key()
+
         if build_result.returncode != 0:
-            print("- Build failed")
+            print("Build failed")
             print(build_result.stderr.decode('utf-8'))
             raise Exception("Build failed")
 
+        # Next embed support icns into ./Resources
+        print("Embedding icns...")
+        for file in Path("payloads/Icon/AppIcons").glob("*.icns"):
+            subprocess.run(
+                ["cp", str(file), "./dist/OpenCore-Patcher.app/Contents/Resources/"],
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            )
+
+
+
+
+    def _embed_key(self):
+        """
+        Embed developer key into binary
+        """
+
+        if not self.args.key:
+            print("No developer key provided, skipping...")
+            return
+        if not self.args.site:
+            print("No site provided, skipping...")
+            return
+
+        print("Embedding developer key...")
+        if not Path("./resources/analytics_handler.py").exists():
+            print("analytics_handler.py not found")
+            return
+
+        lines = []
+        with open("./resources/analytics_handler.py", "r") as f:
+            lines = f.readlines()
+
+        for i, line in enumerate(lines):
+            if line.startswith("SITE_KEY:         str = "):
+                lines[i] = f"SITE_KEY:         str = \"{self.args.key}\"\n"
+            elif line.startswith("ANALYTICS_SERVER: str = "):
+                lines[i] = f"ANALYTICS_SERVER: str = \"{self.args.site}\"\n"
+
+        with open("./resources/analytics_handler.py", "w") as f:
+            f.writelines(lines)
+
+
+    def _strip_key(self):
+        """
+        Strip developer key from binary
+        """
+
+        if not self.args.key:
+            print("No developer key provided, skipping...")
+            return
+        if not self.args.site:
+            print("No site provided, skipping...")
+            return
+
+        print("Stripping developer key...")
+        if not Path("./resources/analytics_handler.py").exists():
+            print("analytics_handler.py not found")
+            return
+
+        lines = []
+        with open("./resources/analytics_handler.py", "r") as f:
+            lines = f.readlines()
+
+        for i, line in enumerate(lines):
+            if line.startswith("SITE_KEY:         str = "):
+                lines[i] = f"SITE_KEY:         str = \"\"\n"
+            elif line.startswith("ANALYTICS_SERVER: str = "):
+                lines[i] = f"ANALYTICS_SERVER: str = \"\"\n"
+
+        with open("./resources/analytics_handler.py", "w") as f:
+            f.writelines(lines)
+
 
     def _delete_extra_binaries(self):
         """
@@ -161,25 +239,25 @@ class CreateBinary:
 
         whitelist_files = [
             "com.dortania.opencore-legacy-patcher.auto-patch.plist",
+            "com.dortania.opencore-legacy-patcher.rsr-monitor.plist",
             "entitlements.plist",
             "launcher.sh",
             "OC-Patcher-TUI.icns",
             "OC-Patcher.icns",
-            "Universal-Binaries.zip",
         ]
 
 
-        print("- Deleting extra binaries...")
+        print("Deleting extra binaries...")
         for file in Path("payloads").glob(pattern="*"):
             if file.is_dir():
                 if file.name in whitelist_folders:
                     continue
-                print(f"  - Deleting {file.name}")
+                print(f"- Deleting {file.name}")
                 subprocess.run(["rm", "-rf", file])
             else:
                 if file.name in whitelist_files:
                     continue
-                print(f"  - Deleting {file.name}")
+                print(f"- Deleting {file.name}")
                 subprocess.run(["rm", "-f", file])
 
 
@@ -190,26 +268,26 @@ class CreateBinary:
 
         patcher_support_pkg_version = constants.Constants().patcher_support_pkg_version
         required_resources = [
-            "Universal-Binaries.zip"
+            "Universal-Binaries.dmg"
         ]
 
-        print("- Downloading required resources...")
+        print("Downloading required resources...")
         for resource in required_resources:
-            if Path(f"./payloads/{resource}").exists():
+            if Path(f"./{resource}").exists():
                 if self.args.reset_binaries:
-                    print(f"  - Removing old {resource}")
+                    print(f"- Removing old {resource}")
                     rm_output = subprocess.run(
-                        ["rm", "-rf", f"./payloads/{resource}"],
+                        ["rm", "-rf", f"./{resource}"],
                         stdout=subprocess.PIPE, stderr=subprocess.PIPE
                     )
                     if rm_output.returncode != 0:
-                        print("- Remove failed")
+                        print("Remove failed")
                         print(rm_output.stderr.decode('utf-8'))
                         raise Exception("Remove failed")
                 else:
-                    print(f"  - {resource} already exists, skipping download")
+                    print(f"- {resource} already exists, skipping download")
                     continue
-            print(f"  - Downloading {resource}...")
+            print(f"- Downloading {resource}...")
 
             download_result = subprocess.run(
                 [
@@ -220,20 +298,13 @@ class CreateBinary:
             )
 
             if download_result.returncode != 0:
-                print("  - Download failed")
+                print("- Download failed")
                 print(download_result.stderr.decode('utf-8'))
                 raise Exception("Download failed")
             if not Path(f"./{resource}").exists():
-                print(f"  - {resource} not found")
+                print(f"- {resource} not found")
                 raise Exception(f"{resource} not found")
 
-            print("  - Moving into payloads")
-            mv_output = subprocess.run(["mv", resource, "./payloads/"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            if mv_output.returncode != 0:
-                print("  - Move failed")
-                print(mv_output.stderr.decode('utf-8'))
-                raise Exception("Move failed")
-
 
     def _generate_payloads_dmg(self):
         """
@@ -244,35 +315,35 @@ class CreateBinary:
 
         if Path("./payloads.dmg").exists():
             if not self.args.reset_binaries:
-                print("  - payloads.dmg already exists, skipping creation")
+                print("- payloads.dmg already exists, skipping creation")
                 return
 
-            print("  - Removing old payloads.dmg")
+            print("- Removing old payloads.dmg")
             rm_output = subprocess.run(
                 ["rm", "-rf", "./payloads.dmg"],
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE
             )
             if rm_output.returncode != 0:
-                print("- Remove failed")
+                print("Remove failed")
                 print(rm_output.stderr.decode('utf-8'))
                 raise Exception("Remove failed")
 
-        print("  - Generating DMG...")
+        print("- Generating DMG...")
         dmg_output = subprocess.run([
             'hdiutil', 'create', './payloads.dmg',
-            '-megabytes', '32000',
+            '-megabytes', '32000',  # Overlays can only be as large as the disk image allows
             '-format', 'UDZO', '-ov',
-            '-volname', 'payloads',
+            '-volname', 'OpenCore Patcher Resources (Base)',
             '-fs', 'HFS+',
             '-srcfolder', './payloads',
             '-passphrase', 'password', '-encryption'
         ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         if dmg_output.returncode != 0:
-            print("  - DMG generation failed")
+            print("- DMG generation failed")
             print(dmg_output.stderr.decode('utf-8'))
             raise Exception("DMG generation failed")
 
-        print("  - DMG generation complete")
+        print("- DMG generation complete")
 
 
     def _add_commit_data(self):
@@ -281,7 +352,7 @@ class CreateBinary:
         """
 
         if not self.args.branch and not self.args.commit and not self.args.commit_date:
-            print("  - No commit data provided, adding source info")
+            print("- No commit data provided, adding source info")
             branch = "Built from source"
             commit_url = ""
             commit_date = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
@@ -289,7 +360,7 @@ class CreateBinary:
             branch = self.args.branch
             commit_url = self.args.commit
             commit_date = self.args.commit_date
-        print("  - Adding commit data to Info.plist")
+        print("- Adding commit data to Info.plist")
         plist_path = Path("./dist/OpenCore-Patcher.app/Contents/Info.plist")
         plist = plistlib.load(Path(plist_path).open("rb"))
         plist["Github"] = {
@@ -318,7 +389,7 @@ class CreateBinary:
 
         """
 
-        print("  - Patching LC_VERSION_MIN_MACOSX")
+        print("- Patching LC_VERSION_MIN_MACOSX")
         path = './dist/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher'
         find = b'\x00\x0D\x0A\x00' # 10.13 (0xA0D)
         replace = b'\x00\x0A\x0A\x00' # 10.10 (0xA0A)
@@ -335,13 +406,13 @@ class CreateBinary:
         """
 
         path = "./dist/OpenCore-Patcher"
-        print(f"  - Removing {path}")
+        print(f"- Removing {path}")
         rm_output = subprocess.run(
             ["rm", "-rf", path],
             stdout=subprocess.PIPE, stderr=subprocess.PIPE
         )
         if rm_output.returncode != 0:
-            print(f"  - Remove failed: {path}")
+            print(f"- Remove failed: {path}")
             print(rm_output.stderr.decode('utf-8'))
             raise Exception(f"Remove failed: {path}")
 
@@ -351,13 +422,13 @@ class CreateBinary:
         Validate generated binary
         """
 
-        print("  - Validating binary")
+        print("- Validating binary")
         validate_output = subprocess.run(
             ["./dist/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher", "--build", "--model", "MacPro3,1"],
             stdout=subprocess.PIPE, stderr=subprocess.PIPE
         )
         if validate_output.returncode != 0:
-            print("  - Validation failed")
+            print("- Validation failed")
             print(validate_output.stderr.decode('utf-8'))
             raise Exception("Validation failed")
 

CHANGELOG.md

@@ -1,5 +1,141 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.6.7
+- Resolve partition buttons overlapping in Install OpenCore UI
+  - ex. "EFI" and additional FAT32 partitions on a single drive
+- Re-enable mediaanalysisd on Ventura
+  - Allows for Live Text support on systems with3802 GPUs
+    - ie. Intel Ivy Bridge and Haswell, Nvidia Kepler
+  - Previously disabled due to high instability in Photos with Face Scanning, now resolved
+- Work-around crashing after patching with MenuBar2 implementation enabled
+  - Setting must be re-enabled after patching
+- Update non-Metal Binaries:
+  - Resolve window placement defaulting past top of screen for some apps
+    - ex. OpenCore-Patcher.app during root patching
+  - Resolve indeterminate progress bars not rendering with wxWidgets in Monterey and later
+    - ex. OpenCore-Patcher.app
+- UI changes:
+  - Add "Show Log File" button to menubar
+- Avoid listing unsupported installer to download by default
+  - ex. macOS 14 InstallAssistant.pkg
+- Resolve crash when fetching remote macOS installers offline
+- Avoid displaying root patches on unsupported macOS versions
+  - ex. macOS 14
+- Backend changes:
+  - Call `setpgrp()` to prevent app from being killed if parent process is killed (ie. LaunchAgents)
+  - Rework logging handler:
+    - Implement formatted logging
+      - Allowing easier debugging
+    - Implement per-version, per-run file logging
+      - ex. OpenCore-Patcher (0.6.7) (2021-12-31-12-34-56-666903).log
+    - Keep only 10 latest log files
+    - Reveal log file in Finder on main thread crash
+    - Avoid writing username to log file
+  - Resolve SharedSupport.dmg pathing error during macOS Installer Verification
+    - Applicable to systems with 2 (or more) USB Installers with the same name plugged in
+  - Resolve payloads path being mis-routed during CLI calls
+  - Add UI when fetching root patches for host
+  - Remove progress bar work-around for non-Metal in Monterey and later
+    - Requires host to have been patched with PatcherSupportPkg 1.1.2 or newer
+- Increment Binaries:
+  - PatcherSupportPkg 1.1.2 - release
+
+## 0.6.6
+- Implement option to disable ColorSync downgrade on HD 3000 Macs
+  - Allows for Display Profiles support on some units
+    - Note: black box rendering issues will likely appear
+  - Thanks [@jazzzny](https://github.com/Jazzzny)
+- Rename payloads.dmg volume name to "OpenCore Patcher Resources (Base)"
+  - Allows for better identification when mounted (ex. Disk Utility while app is running)
+- Implement DMG-based PatcherSupportPkg system
+  - Reduces both app size and root patching time
+- Resolve incorrect remote KDK matching for macOS betas
+  - ex. Beta 4 KDK being recommended for Beta 3 install
+- Resolve low power mode on MacPro6,1
+  - Credit to CaseyJ's [PCI Bus Enumeration Patch](https://github.com/AMD-OSX/AMD_Vanilla/pull/196)
+- Resolve PCI eject menu appearing on unsupported hardware
+- Resolve kernel panic on wake for AMD TeraScale 1 and Nvidia Tesla 8000 series GPUs
+- Resolve loss of Ethernet after wake on MacPro3,1 in Ventura
+- Resolve graphics corruption on wake for TeraScale 1
+  - Patch currently limited to Ventura and newer
+- Restore Function Keys on MacBook5,2 and MacBook4,1
+  - Implementation by [@jazzzny](https://github.com/Jazzzny)
+- Update non-Metal Binaries:
+  - Resolves cryptexd and sshd crashes
+  - Resolves screen recording regression
+  - Resolves Photo Booth on macOS Monterey and later
+    - May require tccplus for permissions
+- Resolve Application alias not being created with AutoPatcher
+- Backend changes:
+  - Rename OCLP-Helper to OpenCore-Patcher
+    - Allows for better identification when displaying prompts
+  - Reimplement wxPython GUI into modularized system:
+    - Allows for easier maintenance and future expansion
+    - Changes include:
+      - Reworked settings UI
+      - Unified download UI with time remaining
+      - Implement in-app update system
+        - Guides users to update OpenCore and Root Patches once update's installed
+      - Expand app update checks to include nightly users
+        - ex. 0.6.6 nightly -> 0.6.6 release
+      - Implement macOS installer verification after flashing
+      - Implement proper UI call backs on long processes
+        - ex. Root patching
+      - Implement default selections for disks and installers
+      - Set about and quit items
+  - Utilize `py-applescript` for authorization prompts
+    - Avoids displaying prompts with `osascript` in the title
+    - Due to limitations, only used for installer creation and OpenCore installation
+  - Resolve exception handler not logging to file
+  - Display raised exceptions from main thread to users
+- Increment Binaries:
+  - PatcherSupportPkg 1.1.0 - release
+  - OpenCorePkg 0.9.2 - release
+  - Lilu 1.6.6 - rolling (d8f3782)
+  - RestrictEvents 1.1.1 - release
+  - FeatureUnlock 1.1.4 - release
+  - BlueToolFixup 2.6.6 - release
+
+## 0.6.5
+- Update 3802 Patchset Binaries:
+  - Resolves additional 3rd party app crashes on Metal with macOS 13.3+
+  - ex: PowerPoint's "Presentation Mode"
+- Update non-Metal Binaries:
+  - Resolves Safari 16.4 frozen canvas rendering
+  - ex: Google Docs
+- Allow for coexistence of USB 3.0 controllers and USB 1.1 patches on macOS 13+
+  - Restores USB 3.0 expansion card support on USB 1.1 machines such as MacPro5,1
+- Resolve OpenCL rendering on Nvidia Web Drivers
+  - thanks [@jazzzny](https://github.com/Jazzzny)
+- Resolve UI unable to download macOS installers on unknown models
+  - ex. M2 Macs and Hackintoshes
+- Implement minimum OS check for installer creation
+  - Prevents vague errors when creating Ventura installers on Yosemite
+- Resolve WindowServer crashing with Rapid Security Response (RSR) installation
+  - Primarily applicable for Haswell iGPUs on 13.3.1 (a)
+- Update legacy Wireless binaries
+  - Resolve wifi crashing on 13.4 with BCM94322, BCM943224 and Atheros chipsets
+- Backend changes:
+  - macos_installer_handler.py:
+    - Expand OS support for IA parsing in SUCatalog
+  - gui_main.py:
+    - Fix spacing regression introduced with `.AppleSystemUIFont` implementation
+- Increment Binaries:
+  - PatcherSupportPkg 0.9.7 - release
+- Build Server Changes:
+  - Upgrade CI Host to macOS Monterey
+  - Upgrade Xcode to 14.2
+  - Switch from `altool` to `notarytool` for notarization
+
+## 0.6.4
+- Backend changes:
+  - Implement new analytics_handler.py module
+    - Adds support for anonymous analytics including host info (and crash reports in the future)
+    - Can be disabled via GUI or `defaults write com.dortania.opencore-legacy-patcher DisableCrashAndAnalyticsReporting -bool true`
+- Resolve Safari rendering error on Ivy Bridge in macOS 13.3+
+- Increment Binaries:
+  - RestrictEvents 1.1.1 - rolling (495f4d5)
+
 ## 0.6.3
 - Update non-Metal Binaries:
   - Resolves Safari 16.4 rendering issue

LICENSE.txt

@@ -0,0 +1,14 @@
+Copyright (c) 2020-2023, Dhinak G
+Copyright (c) 2020-2023, Mykola Grymalyuk
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
+This product includes software developed by the organization.
+4. Neither the name of the copyright holder nor the names the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

OpenCore-Patcher-GUI.spec

@@ -9,7 +9,7 @@ block_cipher = None
 a = Analysis(['OpenCore-Patcher-GUI.command'],
              pathex=[],
              binaries=[],
-             datas=[('payloads.dmg', '.')],
+             datas=[('payloads.dmg', '.'), ('Universal-Binaries.dmg', '.')],
              hiddenimports=[],
              hookspath=[],
              hooksconfig={},
@@ -49,6 +49,7 @@ app = BUNDLE(coll,
              icon="payloads/OC-Patcher.icns",
              bundle_identifier="com.dortania.opencore-legacy-patcher",
              info_plist={
+                "CFBundleName": "OpenCore Legacy Patcher",
                 "CFBundleShortVersionString": constants.Constants().patcher_version,
                 "NSHumanReadableCopyright": constants.Constants().copyright_date,
                 "LSMinimumSystemVersion": "10.10.0",

PRIVACY.md

@@ -0,0 +1,25 @@
+# Privacy Policy
+
+OpenCore Legacy Patcher may collect pseudo-anonymized data about the host system and the OpenCore Legacy Patcher application. This data is used to improve the project and to help diagnose issues. The data collected is as follows:
+
+* System's UUID as a SHA1 hash
+  * This is used to identify the system and to prevent duplicate reports
+  * Cannot be used to identify the system without the user providing the UUID
+* Application name and version
+* System's OS version
+* System's model name, GPUs present and firmware vendor
+  * May include more hardware information in the future (ex. CPU, WiFi, etc)
+* General country code of system's reported region
+  * ex. `US`, `CA`, etc
+
+Identifiable data such as IP addresses, MAC addresses, serial numbers, etc. are not collected.
+
+In the future, crash logs may also be collected to help with diagnosing issues.
+----------
+
+Users who wish to opt-out can do so either via the application's preferences or via the following command:
+```
+defaults write com.dortania.opencore-legacy-patcher DisableCrashAndAnalyticsReporting -bool true
+```
+
+To have your data removed, please contact us via our [Discord server](https://discord.gg/rqdPgH8xSN) and provide the UUID of your system.

README.md

@@ -91,6 +91,8 @@ To run the project from source, see here: [Build and run from source](./SOURCE.m
   * Aid with Nvidia Web Driver research and development
 * [joevt](https://github.com/joevt)
   * [FixPCIeLinkrate](https://github.com/joevt/joevtApps)
+* [Jazzzny](https://github.com/Jazzzny)
+  * Research and various contributions to the project
 * Amazing users who've graciously donate hardware:
   * [JohnD](https://forums.macrumors.com/members/johnd.53633/) - 2013 Mac Pro
   * [SpiGAndromeda](https://github.com/SpiGAndromeda) - AMD Vega 64

SOURCE.md

@@ -2,13 +2,13 @@
 
 OpenCore Legacy Patcher at its core is a Python-based GUI/CLI-based application. In turn, to run the project from source, you simply need to invoke the OpenCore-Patcher-GUI.command file via Python.
 
-For developers wishing to validate mainline changes, you may use these nightly links:
+For developers wishing to validate mainline changes, you may use this link: [GUI (Graphical Based App)](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-wxpython/main/OpenCore-Patcher.app%20%28GUI%29.zip)
 
-* [GUI (Graphical Based App)](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-wxpython/main/OpenCore-Patcher.app%20%28GUI%29.zip)
+* **Warning**: Nightly builds (untagged builds built from the latest commit) are actively developed OpenCore Legacy Patcher builds. These builds have not been tested, are not guaranteed to work, and are not guaranteed to be safe. Do not use nightlies without a good reason to do so, and do not use them on your main machine. Additionally, these binaries should not be used without first consulting the [CHANGELOG](./CHANGELOG.md).
 
-**Warning**: These binaries should not be used without first consulting the [CHANGELOG](./CHANGELOG.md). Do not distribute these links in forums, please link to this document instead.
-
-* Users running new builds of the project without understanding what has changed are at a higher risk of bricking their installation as they do not read any warnings provided in the CHANGELOG. We wish to minimize these situations as much as possible.
+  **Do not share _any_ links to these binaries** in forums; please link to **this document only**.
+  * Additionally, do not reupload these binaries or download binaries from other sites. Using binaries from untrusted sources is a security issue, as they may have been tampered with.
+* Users running new builds of the project without understanding what has changed and the implications of installing software under active development are at a higher risk of bricking their installation as they do not read any warnings provided in the CHANGELOG. We wish to minimize these situations as much as possible.
 
 ## Getting Started
 
@@ -32,7 +32,7 @@ pip3 install -r requirements.txt
 If you have any installation errors, see the following troubleshooting options:
 
 * Use Python 3.10
-  *  Our build server currently uses Python 3.10 for generating binaries used in releases
+  * Our build server currently uses Python 3.10 for generating binaries used in releases
 * Use .whl snapshots for installing additional dependencies
 
 ## Running OpenCore Legacy Patcher
@@ -57,10 +57,6 @@ Pass `-h` or `--help` for more information on supported CLI arguments.
 
 The main goal of generating prebuilt binaries is to strip the requirement of a local Python installation for users. For developers, there's very little benefit besides enabling dark mode support in the GUI. For development, simply use the OpenCore-Patcher-GUI.command file with a Python 3 installation.
 
-* Note that due to PyInstaller's linking mechanism, binaries generated on Catalina and newer are not compatible with High Sierra and older
-  * To ensure the best compatibility, generate binaries on macOS Mojave. These binaries will be compatible with macOS 10.9 to macOS 12.
-  * Currently our build system is a [Macmini8,1 provided by MacStadium](https://www.macstadium.com/opensource) running macOS Mojave (10.14.6).
-
 ```sh
 # Install PyInstaller
 pip3 install pyinstaller

data/os_data.py

@@ -28,22 +28,51 @@ class os_data(enum.IntEnum):
 
 class os_conversion:
 
-    def os_to_kernel(os):
-        # Convert OS version to major XNU version
+    def os_to_kernel(os: str) -> int:
+        """
+        Convert OS version to major XNU version
+
+        Parameters:
+            os (str): OS version
+
+        Returns:
+            int: Major XNU version
+        """
         if os.startswith("10."):
             return (int(os.split(".")[1]) + 4)
         else:
             return (int(os.split(".")[0]) + 9)
 
-    def kernel_to_os(kernel):
-        # Convert major XNU version to OS version
+
+    def kernel_to_os(kernel: int) -> str:
+        """
+        Convert major XNU version to OS version
+
+        Parameters:
+            kernel (int): Major XNU version
+
+        Returns:
+            str: OS version
+        """
         if kernel >= os_data.big_sur:
             return str((kernel - 9))
         else:
             return str((f"10.{kernel - 4}"))
 
-    def is_os_newer(source_major, source_minor, target_major, target_minor):
-        # Check if OS version 1 is newer than OS version 2
+
+    def is_os_newer(source_major: int, source_minor: int, target_major: int, target_minor: int) -> bool:
+        """
+        Check if OS version 1 is newer than OS version 2
+
+        Parameters:
+            source_major (int): Major XNU version of OS version 1
+            source_minor (int): Minor XNU version of OS version 1
+            target_major (int): Major XNU version of OS version 2
+            target_minor (int): Minor XNU version of OS version 2
+
+        Returns:
+            bool: True if OS version 1 is newer than OS version 2
+        """
         if source_major < target_major:
             return True
         elif source_major == target_major:
@@ -52,8 +81,17 @@ class os_conversion:
             else:
                 return False
 
-    def convert_kernel_to_marketing_name(kernel):
-        # Convert major XNU version to Marketing Name
+
+    def convert_kernel_to_marketing_name(kernel: int) -> str:
+        """
+        Convert major XNU version to Marketing name
+
+        Parameters:
+            kernel (int): Major XNU version
+
+        Returns:
+            str: Marketing name of OS
+        """
         try:
             # Find os_data enum name
             os_name = os_data(kernel).name
@@ -70,8 +108,17 @@ class os_conversion:
 
         return os_name
 
-    def convert_marketing_name_to_kernel(marketing_name):
-        # Convert Marketing Name to major XNU version
+
+    def convert_marketing_name_to_kernel(marketing_name: str) -> int:
+        """
+        Convert Marketing Name to major XNU version
+
+        Parameters:
+            marketing_name (str): Marketing Name of OS
+
+        Returns:
+            int: Major XNU version
+        """
         try:
             # Find os_data enum value
             os_kernel = os_data[marketing_name.lower().replace(" ", "_")]
@@ -81,16 +128,18 @@ class os_conversion:
         return int(os_kernel)
 
 
-    def find_largest_build(build_array):
-        # Find the newest version within an array of versions
-        # These builds will have both numbers and letters in the version
-        # ex:
-        # [
-        #    "22A5295i",
-        #    "22A5266r",
-        #    "22A5286j",
-        #    "22A5295h",
-        # ]
+    def find_largest_build(build_array: list) -> str:
+        """
+        Find the newest version within an array of versions
+        These builds will have both numbers and letters in the version
+        ex:
+        [
+            "22A5295i",
+            "22A5266r",
+            "22A5286j",
+            "22A5295h",
+        ]
+        """
 
         max_length =        0  # Length of the longest build
         build_array_split = [] # 'build_array', converted into individual array of elements

data/sys_patch_dict.py

@@ -58,9 +58,15 @@ class SystemPatchDictionary():
 
         self.os_major:              int = os_major
         self.os_minor:              int = os_minor
+        self.os_float:            float = float(f"{self.os_major}.{self.os_minor}")
         self.non_metal_os_support: list = non_metal_os_support
         self.patchset_dict:        dict = {}
 
+        # XNU Kernel versions
+        self.macOS_12_0_B7:       float = 21.1
+        self.macOS_12_4:          float = 21.5
+        self.macOS_12_5:          float = 21.6
+
         self._generate_sys_patch_dict()
 
 
@@ -97,6 +103,9 @@ class SystemPatchDictionary():
                             "GPUSupport.framework": "10.14.3",
                             "SkyLight.framework":  f"10.14.6-{self.os_major}",
                         },
+                        "/System/Applications": {
+                            **({ "Photo Booth.app": "11.7.6"} if self.os_major >= os_data.os_data.monterey else {}),
+                        },
                     },
                     "Remove": {
                         "/System/Library/Extensions": [
@@ -135,8 +144,11 @@ class SystemPatchDictionary():
                     },
                     "Processes": {
                         # 'When Space Allows' option introduced in 12.4 (XNU 21.5)
-                        **({"defaults write /Library/Preferences/.GlobalPreferences.plist ShowDate -int 1": True } if os_data.os_conversion.is_os_newer(os_data.os_data.monterey, 4, self.os_major, self.os_minor) else {}),
+                        **({"defaults write /Library/Preferences/.GlobalPreferences.plist ShowDate -int 1": True } if self.os_float >= self.macOS_12_4 else {}),
                         "defaults write /Library/Preferences/.GlobalPreferences.plist InternalDebugUseGPUProcessForCanvasRenderingEnabled -bool false": True,
+                        "defaults write /Library/Preferences/.GlobalPreferences.plist WebKitExperimentalUseGPUProcessForCanvasRenderingEnabled -bool false": True,
+                        # MenuBar2 breaks macOS if enabled before patching
+                        "defaults write /Library/Preferences/.GlobalPreferences.plist Amy.MenuBar2Beta -bool false": True,
                     },
                 },
                 "Non-Metal IOAccelerator Common": {
@@ -538,7 +550,7 @@ class SystemPatchDictionary():
                             "NVDANV50HalTesla.kext":       "10.13.6",
                             "NVDAResmanTesla.kext":        "10.13.6",
                             # Apple dropped NVDAStartup in 12.0 Beta 7 (XNU 21.1)
-                            **({ "NVDAStartup.kext":       "12.0 Beta 6" } if os_data.os_conversion.is_os_newer(os_data.os_data.monterey, 0, self.os_major, self.os_minor) else {})
+                            **({ "NVDAStartup.kext":       "12.0 Beta 6" } if self.os_float >= self.macOS_12_0_B7 else {})
                         },
                     },
                 },
@@ -569,7 +581,7 @@ class SystemPatchDictionary():
                         },
                         "/System/Library/Frameworks": {
                             # XNU 21.6 (macOS 12.5)
-                            **({ "Metal.framework": "12.5 Beta 2"} if (os_data.os_conversion.is_os_newer(os_data.os_data.monterey, 5, self.os_major, self.os_minor) and self.os_major < os_data.os_data.ventura) else {}),
+                            **({ "Metal.framework": "12.5 Beta 2"} if (self.os_float >= self.macOS_12_5 and self.os_major < os_data.os_data.ventura) else {}),
                         },
                         "/System/Library/PrivateFrameworks": {
                             "GPUCompiler.framework": "11.6",
@@ -600,6 +612,10 @@ class SystemPatchDictionary():
                             "GeForceTeslaGLDriverWeb.bundle": "WebDriver-387.10.10.10.40.140",
                             "GeForceTeslaVADriverWeb.bundle": "WebDriver-387.10.10.10.40.140",
                         },
+                        "/System/Library/PrivateFrameworks": {
+                            # Restore OpenCL by adding missing compiler files
+                            **({ "GPUCompiler.framework": "11.6"} if self.os_major >= os_data.os_data.monterey else {}),
+                        },
                     },
                     "Install Non-Root": {
                         "/Library/Extensions": {
@@ -688,7 +704,7 @@ class SystemPatchDictionary():
                             "AMD3800Controller.kext":        "10.13.6",
                             "AMD4600Controller.kext":        "10.13.6",
                             "AMD4800Controller.kext":        "10.13.6",
-                            "ATIRadeonX2000.kext":           "10.13.6",
+                            "ATIRadeonX2000.kext":           "10.13.6" if self.os_major < os_data.os_data.ventura else "10.13.6 TS1",
                             "ATIRadeonX2000GA.plugin":       "10.13.6",
                             "ATIRadeonX2000GLDriver.bundle": "10.13.6",
                             "ATIRadeonX2000VADriver.bundle": "10.13.6",

docs/ACCEL.md

@@ -7,7 +7,7 @@
 * [Keyboard Backlight broken](#keyboard-backlight-broken)
 * [Photos and Maps Apps Heavily Distorted](#photos-and-maps-apps-heavily-distorted)
 * [Cannot press "Done" when editing a Sidebar Widget](#cannot-press-done-when-editing-a-sidebar-widget)
-* [Wake from sleep heavily distorted on AMD/ATI in macOS 11.3 and newer](#wake-from-sleep-heavily-distorted-on-amd-ati-in-macos-11-3-and-newer)
+* [Wake from sleep heavily distorted on AMD/ATI from macOS 11.3 to Monterey](#wake-from-sleep-heavily-distorted-on-amd-ati-from-macos-11-3-to-monterey)
 * [Unable to switch GPUs on 2011 15" and 17" MacBook Pros](#unable-to-switch-gpus-on-2011-15-and-17-macbook-pros)
 * [Erratic Colours on ATI TeraScale 2 GPUs (HD5000/HD6000)](#erratic-colours-on-ati-terascale-2-gpus-hd5000-hd6000)
 * [Unable to allow Safari Extensions](#unable-to-allow-Safari-Extensions)
@@ -104,9 +104,11 @@ Due to the Metal Backend, the enhanced color output of these apps seems to heavi
 
 Workaround: Press some combination of Tab, or Tab and then Shift-Tab, or just Shift-Tab until the "Done" button is highlighted. Then press spacebar to activate the button, the same as in any other dialog with a highlighted button halo.
 
-## Wake from sleep heavily distorted on AMD/ATI in macOS 11.3 and newer
+## Wake from sleep heavily distorted on AMD/ATI from macOS 11.3 to Monterey
 
-Unfortunately, this is a very well known issue that the community is investigating. A currently known solution is to downgrade to macOS 11.2.3 or older until a proper fix can be found. Additionally, logging out and logging back in can resolve the issue without requiring a reboot.
+**Fixed for macOS Ventura starting from 0.6.6. Big Sur and Monterey will continue to exhibit the issue.**
+
+For older versions, only known solution is to downgrade to macOS 11.2.3 or older. Additionally, logging out and logging back in can resolve the issue without requiring a reboot.
 
 * Note, this issue should be exclusive to TeraScale 1 GPUs (ie. HD2000-4000). TeraScale 2 GPUs should not exhibit this issue.
 

docs/DEBUG.md

@@ -10,6 +10,8 @@ The easiest way to debug yourself is via Patcher Settings. Here there are many d
 * "Enable OpenCore DEBUG"
 * "Enable Kext DEBUG"
 
+![](../images/ocdebugimage.png)
+
 When you've enabled these 3 options, rebuild OpenCore and install to your drive. This will provide much greater debug information as well as write logs to the EFI Partition.
 
 ## Obtaining OpenCore logs from disk

docs/LICENSE.md

@@ -20,4 +20,4 @@ This patcher is made of multiple external applications from different people and
   * [VMM Patch Set](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/4a8f61a01da72b38a4b2250386cc4b497a31a839/payloads/Config/config.plist#L1222-L1281) - parrotgeek1
   * Apple Binaries - Apple Inc.
 
-Remaining files within OpenCore Legacy Patcher are copyrighted 2020-2022 Mykola Grymalyuk & Dhinak G. For integration into other projects, please request written permission.
+Remaining files within OpenCore Legacy Patcher are distributed under BSD-4-Clause license.

docs/MODELS.md

@@ -18,13 +18,13 @@ The below table will list all supported and unsupported functions of the patcher
 
 Regarding OS support, see below:
 
-* Machines listing `YES - Ventura and older` means they cannot run macOS Ventura at this time. Machines with only `YES` can run all of the supported macOS versions offered by OpenCore Legacy Patcher.
-
 | Support Entry | Supported OSes | Description | Comment |
 | :--- | :--- | :--- | :--- |
-| HostOS | macOS 10.9 - macOS 13 | Refers to OSes where running OpenCore-Patcher.app are supported | Supports 10.7+ if [Python 3.9 or higher](https://www.python.org/downloads/) is manually installed, simply run the `OpenCore-Patcher-GUI.command` located in the repo |
+| HostOS | macOS 10.10 - macOS 13 | Refers to OSes where running OpenCore-Patcher.app are supported | Supports 10.7+ if [Python 3.9 or higher](https://www.python.org/downloads/) is manually installed, simply run the `OpenCore-Patcher-GUI.command` located in the repo |
 | TargetOS | macOS 11 - macOS 13 | Refers to OSes that can be patched to run with OpenCore | May support 10.4 and newer (in a potentially broken state). No support provided. |
 
+* macOS Ventura installer creation requires 10.11 or later
+
 ### MacBook
 
 | SMBIOS | Year | Supported | Comment |
@@ -145,8 +145,8 @@ Regarding OS support, see below:
 | :--- | :--- | :--- | :--- |
 | MacPro1,1 | Mid-2006 | <span style="color:red"> NO </span> | 32-Bit Firmware limitation |
 | MacPro2,1 | Mid-2007 | ^^ | ^^ |
-| MacPro3,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issesues/1021)) <br/>- Potential boot issues with stock Bluetooth card, recommend removing to avoid kernel panics |
-| MacPro4,1 | Early 2009 | ^^ | - Everything is supported as long as GPU is Metal capable <br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issesues/1021))|
+| MacPro3,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)) <br/>- Potential boot issues with stock Bluetooth card, recommend removing to avoid kernel panics |
+| MacPro4,1 | Early 2009 | ^^ | - Everything is supported as long as GPU is Metal capable <br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
 | MacPro5,1 | Mid-2010, Mid-2012 | ^^ | ^^ |
 | MacPro6,1 | Late 2013 | ^^ | - CPU Power Management currently unsupported<br/> - No DRM support |
 

docs/PATCHEXPLAIN.md

@@ -139,6 +139,10 @@ Below is a rundown of the main logic that OpenCore Legacy Patcher uses to gain n
   * Reason: Enables Content Caching when using VMM spoofing
   * Logic: Adds args to NVRAM
   * Models: Any model using VMM spoofing
+* `amfi=0x80`
+  * Reason: Disables Apple Mobile File Integrity to allow for root patches
+  * Logic: Adds args to NVRAM
+  * Models: Any model that requires unsigned root patches
 
 ### UEFI -> ProtocolOverrides
 
@@ -184,6 +188,16 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
 * RestrictEvents
   * Reason: Disables memory errors on MacPro7,1
   * Models: Mac Pros and Xserves
+* CryptexFixup
+  * Reason: Installs non AVX2.0 Cryptex on non AVX2.0 CPUs
+  * Models: All CPUs Ivy Bridge and older
+* AutoPkgInstaller
+  * Reason: Allows for automatic root patching
+* NVMeFix
+  * Reason: Fixes 3rd party NVMe support
+* RSRHelper
+  * Reason: Fixes Rapid Security Response Support on root patched installs
+* 
 
 ### Ethernet
 
@@ -197,6 +211,23 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
   * Reason: Inject old Broadcom Ethernet kext to resolve networking in Big Sur
   * Logic: Patch out conflicting symbols to not collide existing BCM5701Ethernet
   * Models: 2011 and older Broadcom Ethernet require
+* Intel82574L
+  * Reason: Resolves Ethernet Support on MacPros 
+  * Models: MacPro3,1 - 5,1
+* CatalinaIntelI210Ethernet
+  * Reason: Fixes Intel i210/i225 NIC support on pre-Ivy Macs
+* AppleIntel8254XEthernet
+  * Reason: Resolves Ethernet Support on MacPros 
+  * Models: MacPro3,1 - 5,1
+
+### Firewire 
+
+* IOFireWireFamily
+  * Reason: Allows for FireWire Boot Support
+* IOFireWireSBP2
+  * Reason: Allows for FireWire Boot Support
+* IOFireWireSerialBusProtoColTransport
+  * Reason: Allows for FireWire Boot Support
 
 ### Maps
 
@@ -215,14 +246,12 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
 
 ### Wifi
 
-* IO80211HighSierra
-  * Reason: Re-inject Atheros wifi drivers from High Sierra
-  * Logic: Patch out conflicting symbols to not collide existing IO80211Family
-  * Models: Atheros cards
-* IO80211Mojave
-  * Reason: Re-inject Broadcom wifi drivers from Mojave
-  * Logic: Patch out conflicting symbols to not collide existing IO80211Family
-  * Models: BCM94322
+* IO80211ElCap
+  * Reason: Re-inject WiFi drivers from El Capitan 
+  * Models: BCM94328, BCM94322 and Atheros chipsets
+* corecaptureElCap.kext
+  * Reason: Re-inject WiFi drivers from El Capitan 
+  * Models: BCM94328, BCM94322 and Atheros chipsets
 
 ### Misc
 
@@ -238,6 +267,41 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
 * SMC-Spoof
   * Reason: Spoofs SMC version to 9.9999
   * Models: All models require when spoofing minimal or higher
+* AppleRAIDCard
+  * Adds AppleRaidCard Support for Xserves
+* AMDGPUWakeHandler
+  * Reason: Adds Software Based Demux for 2011 15/17 Macbook Pros
+* AppleIntelCPUPowerManagement and AppleIntelCPUPowerManagementClient
+  * Reason: Restores Ivy Bridge and older CPU Power Management
+* AppleUSBTopCase
+  * Reason: Restore USB Keyboard support on Mac OS Ventura
+* AppleUSBMultitouch and AppleUSBTrackpad
+  * Reason: Restore USB Trackpad support on Mac OS Ventura
+* ASPP-Override
+  * Reason: Forces ACPI_SMC_PlatformPlugin to outmatch X86PlatformPlugin and disable firmware throttling 
+* BacklightInjector
+  * Reason: Fixes Brightness in iMacs with upgraded GPUs
+* BigSurSDXC
+  * Reason: Restores SDXC Support in Pre Ivy-Bridge Macs
+* Bluetooth-spoof
+  * Reason: Spoofs legacy Bluetooth to work on Monterey and newer
+* Innie
+  * Reason: Makes all PCIe drives appear internal
+  * Models: MacPro3,1 and newer & Xserve3,1 and newer 
+* KDKlessWorkaround
+  * Reason: Helps with Mac os updates on KDKless patched systems
+* LegacyUSBVieoSupport
+  * Reason: Fixes Legacy USB iSight support
+* MonteAHCIPort
+  * Reason: Fixes SSD support for stock SSD found in MacBookAir6,x
+* NoAVXFSCompressionTypeZlib
+  * Reason: Prevents AVXFSCompressionTypeZlib crash on pre AVX1.0 systems in 12.4+
+* SimpleMSR 
+  * Reason: Disables BD PROCHOT to prevent firmware throttling on Nehalem+ MacBooks
+* LegacyKeyboardInjector
+  * Reason: Fixes function keys on MacBook4,1/MacBook5,2
+
+
 :::
 
 ## On-Disk Patches
@@ -286,6 +350,15 @@ Applicable for BCM94328, BCM94322 and Atheros Wifi cards
 
 * OpenCL (libCLVMNVPTXPlugin.dylib, NVPTX.dylib)
   * Reason: Re-add Kepler hardware acceleration support
+* Metal 
+  * Reason: 3802 based GPU's broken by 13.3, requiring a Metal downgrade to 13.2.1
+
+### PrivateFrameworks
+
+* MTLCompiler
+  * Reason: 3802 based GPU's broken by 13.3, requiring a MTLCompiler downgrade to 13.2.1
+* GPUCompiler
+  * Reason: 3802 based GPU's broken by 13.3, requiring a GPUCompiler downgrade to 13.2.1
 
 :::
 
@@ -306,6 +379,10 @@ Applicable for BCM94328, BCM94322 and Atheros Wifi cards
 
 * AppleGVA/AppleGVACore
   * Reason: Enable DRM support
+* MTLCompiler
+  * Reason: 3802 based GPU's broken by 13.3, requiring a MTLCompiler downgrade to 13.2.1
+* GPUCompiler
+  * Reason: 3802 based GPU's broken by 13.3, requiring a GPUCompiler downgrade to 13.2.1
 
 ### Frameworks
 
@@ -313,12 +390,117 @@ Applicable for BCM94328, BCM94322 and Atheros Wifi cards
   * Reason: Re-add Ivy Bridge hardware acceleration support
 * WebKit (com.apple.WebProcess.sb)
   * Reason: Re-add Ivy Bridge Safari rendering support
+* Metal 
+  * Reason:  3802 based GPU's broken by 13.3, requiring a Metal downgrade to 13.2.1
 :::
 
-::: details non-Metal Graphics Acceleration Patches (11.0+)
+::: details Intel Haswell Graphics Acceleration Patches (13.0+)
+
+### Extensions 
+
+* AppleIntelFramebufferAzul.kext
+* AppleIntelHD5000Graphics.kext
+* AppleIntelHD5000GraphicsGLDriver.bundle
+* AppleIntelHD5000GraphicsMTLDriver.bundle
+* AppleIntelHD5000GraphicsVADriver.bundle 
+* AppleIntelHSWVA.bundle
+* AppleIntelGraphicsShared.bundle
+
+### Frameworks 
+
+* Metal 
+  * Reason:  3802 based GPU's broken by 13.3, requiring a Metal downgrade to 13.2.1
+
+### PrivateFrameworks
+
+* MTLCompiler
+  * Reason: 3802 based GPU's broken by 13.3, requiring a MTLCompiler downgrade to 13.2.1
+* GPUCompiler
+  * Reason: 3802 based GPU's broken by 13.3, requiring a GPUCompiler downgrade to 13.2.1
+
+:::
+
+::: details Intel Broadwell Graphics Acceleration Patches (13.0+)
+
+### Extensions 
+
+* AppleIntelBDWGraphics.kext
+* AppleIntelBDWGraphicsFramebuffer.kext
+* AppleIntelBDWGraphicsGLDriver.bundle
+* AppleIntelBDWGraphicsMTLDriver.bundle
+* AppleIntelBDWGraphicsVADriver.bundle
+* AppleIntelBDWGraphicsVAME.bundle
+* AppleIntelGraphicsShared.bundle
+
+
+
+:::
+
+::: details Intel Skylake Graphics Acceleration Patches (13.0+)
+
+### Extensions 
+
+* AppleIntelSKLGraphics.kext
+* AppleIntelSKLGraphicsFramebuffer.kext
+* AppleIntelSKLGraphicsGLDriver.bundle
+* AppleIntelSKLGraphicsMTLDriver.bundle
+* AppleIntelSKLGraphicsVADriver.bundle
+* AppleIntelSKLGraphicsVAME.bundle
+* AppleIntelGraphicsShared.bundle
+
+
+:::
+
+::: details AMD Legacy Vega Graphics Acceleration Patches (13.0+)
 
 ### Extensions
 
+* AMDRadeonX5000.kext
+* AMDRadeonVADriver2.bundle
+* AMDRadeonX5000GLDriver.bundle
+* AMDRadeonX5000MTLDriver.bundle
+* AMDRadeonX5000Shared.bundle
+* AMDShared.bundle
+
+:::
+
+::: details AMD Legacy Polaris Graphics Acceleration Patches (13.0+)
+
+### Extensions
+
+* AMDRadeonX4000.kext
+* AMDRadeonX4000HWServices.kext
+* AMDRadeonVADriver2.bundle
+* AMDRadeonX4000GLDriver.bundle
+* AMDMTLBronzeDriver.bundle
+* AMDShared.bundle
+
+:::
+
+::: details AMD Legacy GCN Graphics Acceleration Patches
+
+### Extensions
+
+* AMD7000Controller.kext
+* AMD8000Controller.kext
+* AMD9000Controller.kext
+* AMD9500Controller.kext
+* AMD10000Controller.kext
+* AMDRadeonX4000.kext
+* AMDRadeonX4000HWServices.kext
+* AMDFramebuffer.kext
+* AMDSupport.kext
+* AMDRadeonVADriver.bundle
+* AMDRadeonVADriver2.bundle
+* AMDRadeonX4000GLDriver.bundle
+* AMDMTLBronzeDriver.bundle
+* AMDShared.bundle
+
+
+
+
+::: details non-Metal Graphics Acceleration Patches (11.0+)
+
 #### General Patches
 
 * IOSurface.kext
@@ -343,6 +525,19 @@ Applicable for BCM94328, BCM94322 and Atheros Wifi cards
     * 0x1ea59a - 0x1ea5b3: nop
     * Replace VSLGestalt to IOLockLock or any other known symbol of the same length.
 
+* NVIDIA Web Drivers Binaries 
+  * GeForceWeb.kext
+  * NVDAGF100HalWeb.kext
+  * NVDAGK100HalWeb.kext
+  * NVDAGM100HalWeb.kext
+  * NVDAGP100HalWeb.kext
+  * NVDAResmanWeb.kext
+  * NVDAStartupWeb.kext
+  * GeForceTeslaWeb.kext
+  * NVDANV50HalTeslaWeb.kext
+  * NVDAResmanTeslaWeb.kext
+    * Reason: Allows for non-Metal Acceleration for NVIDIA Maxwell and Pascal GPUs
+
 * AMD/ATI Binaries
   * AMD2400Controller.kext
   * AMD2600Controller.kext

docs/POST-INSTALL.md

@@ -1,7 +1,7 @@
 # Post-Installation
 
 * [Booting without USB drive](#booting-without-usb-drive)
-* [Booting seamlessly without Verbose or OpenCore Picker](#booting-seamlessly-without-verbose-or-opencore-picker)
+* [Booting seamlessly without Boot Picker](#booting-seamlessly-without-boot-picker)
 * [Applying Post Install Volume Patches](#applying-post-install-volume-patches)
 
 ## Booting without USB drive
@@ -16,17 +16,13 @@ Once you've installed macOS through OpenCore, you can boot up and go through the
 
 And voila! No more USB drive required.
 
-## Booting seamlessly without Verbose or OpenCore Picker
+## Booting seamlessly without Boot Picker
 
-To do this, run the OpenCore Patcher and head to Patcher Settings:
+To do this, run the OpenCore Patcher and head to Patcher Settings, then uncheck "Show OpenCore Bootpicker" on the Build tab:
 
 ![](../images/OCLP-GUI-Settings-ShowPicker.png)
 
-Here you can change different patcher settings, however the main interest is:
-
-* Show Boot Picker
-
-Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, and then you can release the "ESC" key when you see the cursor arrow at the top left.
+Once you've toggled it off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, and then you can release the "ESC" key when you see the cursor arrow at the top left.
 
 ## Enabling SIP
 
@@ -34,6 +30,8 @@ For many users, SIP will be lowered by default on build. For Intel HD 4000 users
 
 Note: Machines running macOS Ventura or systems with non-Metal GPUs cannot enable SIP outright, due to having a patched root volume. Enabling it will brick the installation.
 
+Going forward with 0.6.6, SIP settings can be accessed from the Security tab shown in the images.
+
 | SIP Enabled | SIP Lowered (Root Patching) | SIP Disabled |
 | :--- | :--- | :--- |
 | ![](../images/OCLP-GUI-Settings-SIP-Enabled.png) | ![](../images/OCLP-GUI-Settings-SIP-Root-Patch.png) | ![](../images/OCLP-GUI-Settings-SIP-Disabled.png) |
@@ -48,22 +46,16 @@ If you're unsure whether you should enable SIP, leave it as-is. Systems where yo
 
 Post Install Volume Patches, sometimes also called root patches, are patches that have to be installed to disk for some older Macs to gain back functionality.
 
-OCLP v0.4.4 and higher include an autopatcher, which will automatically root patch your system but **only if the USB install media was created within OCLP.**
+OCLP will automatically root patch your system during a first time install **if the USB install media was created within OCLP.** Users will also be prompted to install these patches after macOS updates or whenever patches are not detected on the system. We recommend rebuilding OpenCore with the latest version of OCLP to take advantage of these new features.
 
-Users with OCLP v0.4.4 or higher will also be prompted to install these patches after macOS updates or whenever patches are not detected on the system. We recommend rebuilding OpenCore with the latest version of OCLP to take advantage of these new features.
+Users can also see whether applicable patches have been installed, date and version the system was root patched with in the Post-Install Menu.
 
-
-
-In OCLP v0.4.5 a new indicator was added to help users to see if, when and on what version the system was root patched. Note that the "Available patches" section above this does not track the status and will always show the patches that are available, whether they're installed or not.
-
-| Automatic install prompt in 0.4.4+ | Last patched status in 0.4.5+ |
+| Automatic install prompt | Status |
 | :--- | :--- |
 | ![](../images/OCLP-GUI-root-patch-update.png) | ![](../images/OCLP-GUI-Root-Patch-Status.png)  |
 
 
 
-
-
 ### Running Post Install patches manually
 
 If you're using OCLP v0.4.3 or earlier, or need to run the patcher manually, you can do so with the app. There is no harm in trying to run the Patcher, as without compatible hardware, nothing will be done. You can see below on whether your hardware needs root volume patching or not.

docs/UNIVERSALCONTROL.md

@@ -209,7 +209,7 @@ Ventura has dropped more models which includes all of the blacklisted Macs in qu
 
 Firstly run the GUI version of OpenCore Legacy Patcher. 
 
-Then go to **Settings**, go to **SMBIOS Settings**, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model **one listed next to your native model in the table for spoofed models below.**
+Then go to **Settings** and **SMBIOS** tab, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model **one listed next to your native model in the table for spoofed models below.**
 
 Notice that "Allow native models" and "Allow Native Spoofs" **are NOT** enabled unlike on Monterey, this is on purpose. They are no longer relevant on Ventura and enabling them will cause boot issues.
 
@@ -239,14 +239,16 @@ Spoofing to any model with native Ventura support should work, but these are the
 
 ::: details macOS Monterey
 
-Firstly, run the GUI version of OpenCore Legacy Patcher. Secondly, go to **Settings** and tick **Allow native models**.
+Firstly, run the GUI version of OpenCore Legacy Patcher. Secondly, go to **Settings** then the **App** tab and tick **Allow native models**.
 
-Then, go to **SMBIOS Settings**, tick **Allow Native Spoofs**, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model to **one listed next to your native model in the table for spoofed models below.**
+[](../images/OCLP-App-Allow-Native-Models.png)
+
+Then, go to **SMBIOS** tab, tick **Allow spoofing native Macs**, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model to **one listed next to your native model in the table for spoofed models below.**
 
 
 | Main Settings view | SMBIOS settings |
 | :--- | :--- |
-| ![](../images/OCLP-allow-native-models.png) | ![](../images/OCLP-smbios-settings.png) |
+| ![](../images/OCLP-SMBIOS-Allow-Native-Spoof.png) | ![](../images/OCLP-smbios-settings.png) |
 
 
 ::: details Table for spoofed models (click to expand)

docs/UPDATE.md

@@ -19,4 +19,4 @@ nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:OCLP-Version
 
 ![](../images/oclp-version.png)
 
-From this, we can see that we're running a RELEASE version of OpenCore 0.6.8 built on March 27th, 2021 with Patcher Version 0.0.20!
+From this, we can see that we're running a RELEASE version of OpenCore 0.8.0 built on April 18th, 2022 with Patcher Version 0.4.5!

docs/VENTURA-DROP.md

@@ -7,7 +7,7 @@ With the release of OpenCore Legacy Patcher v0.5.0 and newer, early support for
 Ventura's release dropped a large amount of Intel hardware, thus requiring the usage of OpenCore Legacy Patcher on the following models (in addition to previously removed models):
 
 * iMac16,1 (21.5-inch, Late 2015)
-* iMac16,2 (21.5-inch 4K, Late 2015)
+* iMac16,2 (21.5-inch and 21.5-inch 4K, Late 2015)
 * iMac17,1 (27-inch 5K, Late 2015)
 * MacBook9,1 (12-inch, Early 2016)
 * MacBookAir7,1 (11-inch, Early 2015)
@@ -78,11 +78,6 @@ With OpenCore Legacy Patcher v0.6.0, basic support has been implemented via Root
 
 :::
 
-### Ethernet issue with Early 2008 Mac Pro
-
-MacPro3,1 suffers from the Ethernet driver dying after returning from sleep, current workaround is to use a USB Ethernet adapter or disable sleep.
-
-
 ::: details Legacy Wireless Support (Resolved in v0.6.0 and newer)
 
 
@@ -140,4 +135,4 @@ The following machines shipped stock with an unsupported GPU:
 * Xserve2,1 - Xserve3,1
 
 
-:::
+:::

payloads/Config/config.plist

@@ -1383,6 +1383,24 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>LegacyKeyboardInjector.kext</string>
+				<key>Comment</key>
+				<string>Legacy Keyboard support for macOS 11+</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string></string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>17.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1943,6 +1961,36 @@
 				<key>Skip</key>
 				<integer>0</integer>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string>
+				<key>Comment</key>
+				<string>CaseySJ - Fix PCI bus enumeration</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>hNt1S0GLVzg=</data>
+				<key>Identifier</key>
+				<string>com.apple.iokit.IOPCIFamily</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>Replace</key>
+				<data>hNvrS0GLVzg=</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
 		</array>
 		<key>Quirks</key>
 		<dict>
@@ -1960,6 +2008,8 @@
 			<false/>
 			<key>DisableIoMapper</key>
 			<false/>
+			<key>DisableIoMapperMapping</key>
+			<false/>
 			<key>DisableLinkeditJettison</key>
 			<false/>
 			<key>DisableRtcChecksum</key>
@@ -2617,6 +2667,8 @@
 			<string>Disabled</string>
 			<key>IgnoreTextInGraphics</key>
 			<false/>
+			<key>InitialMode</key>
+			<string>Auto</string>
 			<key>ProvideConsoleGop</key>
 			<true/>
 			<key>ReconnectGraphicsOnConnect</key>

payloads/InstallPackage/postinstall.sh

@@ -1,4 +1,11 @@
 #!/bin/sh
+
+# Create alias for OpenCore-Patcher.app
+if [ ! -d "/Applications/OpenCore-Patcher.app" ]; then
+    ln -s "/Library/Application Support/Dortania/OpenCore-Patcher.app" "/Applications/OpenCore-Patcher.app"
+fi
+
+# Start root patching
 app_path="/Library/Application Support/Dortania/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher"
 args="--patch_sys_vol"
 "$app_path" "$args" &> "/Users/Shared/.OCLP-AutoPatcher-Log-$(date +"%Y_%m_%d_%I_%M_%p").txt"

payloads/Kexts/Update-Kexts.command

@@ -152,6 +152,26 @@ class GenerateKexts:
                     self._get_latest_release(kext_folder, kext_name)
 
 
+    def _is_build_nightly(self, kext: str, version: str) -> bool:
+        # Load CHANGELOG.md
+        changelog_path = Path(f"../../CHANGELOG.md").absolute()
+        with open(changelog_path, "r") as changelog_file:
+            changelog = changelog_file.read()
+
+        # Check if kext is in changelog
+        if kext not in changelog:
+            return False
+
+        # Check if kext is 'rolling' or 'nightly'
+        for line in changelog.split("\n"):
+            if kext in line and version in line:
+                if ("rolling" in line or "nightly" in line):
+                    return True
+                break
+
+        return False
+
+
     def _get_latest_release(self, kext_folder, kext_name, override_kext_zip_name=None):
         # Get latest release from GitHub API
         repo_url = KEXT_DICTIONARY[kext_folder][kext_name]["Repository"].replace("https://github.com", "https://api.github.com/repos")
@@ -178,7 +198,12 @@ class GenerateKexts:
 
             if packaging.version.parse(remote_version) <= packaging.version.parse(local_version):
                 print(f"  {kext_name} {variant} is up to date: v{local_version}")
-                continue
+                if remote_version == local_version:
+                    if self._is_build_nightly(kext_name, local_version) is False:
+                        continue
+                    print(f"  {kext_name} {variant} is a nightly build, updating...")
+                else:
+                    continue
 
             for asset in latest_release["assets"]:
                 if not asset["name"].endswith(f"{variant}.zip"):
@@ -186,9 +211,9 @@ class GenerateKexts:
                 print(f"  Downloading {kext_name} {variant}: v{remote_version}...")
                 zip_name = f"{override_kext_zip_name}-v{remote_version}-{variant}.zip" if override_kext_zip_name else f"{kext_name}-v{remote_version}-{variant}.zip"
 
-                self._download_file(asset["browser_download_url"], f"./{kext_folder}/{zip_name}", f"{kext_name}.kext")
-                if Path(f"./{kext_folder}/{zip_name}").exists():
+                if Path(f"./{kext_folder}/{zip_name.replace(f'v{remote_version}', f'v{local_version}')}").exists():
                     subprocess.run(["rm", "-rf", f"./{kext_folder}/{zip_name.replace(f'v{remote_version}', f'v{local_version}')}"])
+                self._download_file(asset["browser_download_url"], f"./{kext_folder}/{zip_name}", f"{kext_name}.kext")
                 self._update_constants_file(KEXT_DICTIONARY[kext_folder][kext_name]["Constants Variable"], local_version, remote_version)
 
                 if override_kext_zip_name:

payloads/Tools/OpenCore-Patcher.app/Contents/Info.plist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>OpenCore-Patcher</string>
+	<key>CFBundleExecutable</key>
+	<string>OpenCore-Patcher</string>
+	<key>CFBundleIconFile</key>
+	<string>OC-Patcher.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dortania.opencore-legacy-patcher-helper</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>OpenCore-Patcher</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.10.0</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020-2023 Dortania</string>
+	<key>LSUIElement</key>
+	<true/>
+</dict>
+</plist>

payloads/com.dortania.opencore-legacy-patcher.rsr-monitor.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AssociatedBundleIdentifiers</key>
+	<string>com.dortania.opencore-legacy-patcher</string>
+	<key>Label</key>
+	<string>com.dortania.opencore-legacy-patcher.rsr-monitor</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>rm</string>
+		<string>-rf</string>
+		<string>/Library/Extensions/example.kext</string> <!-- Update kext to correct name -->
+	</array>
+	<key>WatchPaths</key>
+    <array>
+      <string>/System/Volumes/Preboot/UUID/cryptex1/OS.dmg</string> <!-- Update UUID to host's booted Preboot folder -->
+    </array>
+</dict>
+</plist>

requirements.txt

@@ -3,4 +3,5 @@ pyobjc
 wxpython
 pyinstaller
 packaging
-py_sip_xnu
+py_sip_xnu
+py-applescript

resources/analytics_handler.py

@@ -0,0 +1,138 @@
+import datetime
+import plistlib
+from pathlib import Path
+import json
+
+from resources import network_handler, constants, global_settings
+
+
+DATE_FORMAT:      str = "%Y-%m-%d %H-%M-%S"
+ANALYTICS_SERVER: str = ""
+SITE_KEY:         str = ""
+CRASH_URL:        str = ANALYTICS_SERVER + "/crash"
+
+VALID_ANALYTICS_ENTRIES: dict = {
+    'KEY':                 str,               # Prevent abuse (embedded at compile time)
+    'UNIQUE_IDENTITY':     str,               # Host's UUID as SHA1 hash
+    'APPLICATION_NAME':    str,               # ex. OpenCore Legacy Patcher
+    'APPLICATION_VERSION': str,               # ex. 0.2.0
+    'OS_VERSION':          str,               # ex. 10.15.7
+    'MODEL':               str,               # ex. MacBookPro11,5
+    'GPUS':                list,              # ex. ['Intel Iris Pro', 'AMD Radeon R9 M370X']
+    'FIRMWARE':            str,               # ex. APPLE
+    'LOCATION':            str,               # ex. 'US' (just broad region, don't need to be specific)
+    'TIMESTAMP':           datetime.datetime, # ex. 2021-09-01-12-00-00
+}
+
+VALID_CRASH_ENTRIES: dict = {
+    'KEY':                 str,               # Prevent abuse (embedded at compile time)
+    'APPLICATION_VERSION': str,               # ex. 0.2.0
+    'APPLICATION_COMMIT':  str,               # ex. 0.2.0 or {commit hash if not a release}
+    'OS_VERSION':          str,               # ex. 10.15.7
+    'MODEL':               str,               # ex. MacBookPro11,5
+    'TIMESTAMP':           datetime.datetime, # ex. 2021-09-01-12-00-00
+    'CRASH_LOG':           str,               # ex. "This is a crash log"
+}
+
+
+class Analytics:
+
+    def __init__(self, global_constants: constants.Constants) -> None:
+        self.constants: constants.Constants = global_constants
+        self.unique_identity = str(self.constants.computer.uuid_sha1)
+        self.application =     str("OpenCore Legacy Patcher")
+        self.version =         str(self.constants.patcher_version)
+        self.os =              str(self.constants.detected_os_version)
+        self.model =           str(self.constants.computer.real_model)
+        self.date =            str(datetime.datetime.now().strftime(DATE_FORMAT))
+
+
+    def send_analytics(self) -> None:
+        if global_settings.GlobalEnviromentSettings().read_property("DisableCrashAndAnalyticsReporting") is True:
+            return
+
+        self._generate_base_data()
+        self._post_analytics_data()
+
+
+    def send_crash_report(self, log_file: Path) -> None:
+        if ANALYTICS_SERVER == "":
+            return
+        if SITE_KEY == "":
+            return
+        if global_settings.GlobalEnviromentSettings().read_property("DisableCrashAndAnalyticsReporting") is True:
+            return
+        if not log_file.exists():
+            return
+        if self.constants.commit_info[0].startswith("refs/tags"):
+            # Avoid being overloaded with crash reports
+            return
+
+        commit_info = self.constants.commit_info[0].split("/")[-1] + "_" + self.constants.commit_info[1].split("T")[0] + "_" + self.constants.commit_info[2].split("/")[-1]
+
+        crash_data= {
+            "KEY":                 SITE_KEY,
+            "APPLICATION_VERSION": self.version,
+            "APPLICATION_COMMIT":  commit_info,
+            "OS_VERSION":          self.os,
+            "MODEL":               self.model,
+            "TIMESTAMP":           self.date,
+            "CRASH_LOG":           log_file.read_text()
+        }
+
+        network_handler.NetworkUtilities().post(CRASH_URL, json = crash_data)
+
+
+    def _get_country(self) -> str:
+        # Get approximate country from .GlobalPreferences.plist
+        path = "/Library/Preferences/.GlobalPreferences.plist"
+        if not Path(path).exists():
+            return "US"
+
+        try:
+            result = plistlib.load(Path(path).open("rb"))
+        except:
+            return "US"
+
+        if "Country" not in result:
+            return "US"
+
+        return result["Country"]
+
+
+    def _generate_base_data(self) -> None:
+        self.gpus = []
+
+        self.firmware = str(self.constants.computer.firmware_vendor)
+        self.location = str(self._get_country())
+
+        for gpu in self.constants.computer.gpus:
+            self.gpus.append(str(gpu.arch))
+
+        self.data = {
+            'KEY':                 SITE_KEY,
+            'UNIQUE_IDENTITY':     self.unique_identity,
+            'APPLICATION_NAME':    self.application,
+            'APPLICATION_VERSION': self.version,
+            'OS_VERSION':          self.os,
+            'MODEL':               self.model,
+            'GPUS':                self.gpus,
+            'FIRMWARE':            self.firmware,
+            'LOCATION':            self.location,
+            'TIMESTAMP':           self.date,
+        }
+
+        # convert to JSON:
+        self.data = json.dumps(self.data)
+
+
+    def _post_analytics_data(self) -> None:
+        # Post data to analytics server
+        if ANALYTICS_SERVER == "":
+            return
+        if SITE_KEY == "":
+            return
+        network_handler.NetworkUtilities().post(ANALYTICS_SERVER, json = self.data)
+
+
+

resources/arguments.py

@@ -50,7 +50,7 @@ class arguments:
         """
         Enter validation mode
         """
-
+        logging.info("Set Validation Mode")
         validation.PatcherValidation(self.constants)
 
 
@@ -59,9 +59,9 @@ class arguments:
         Start root volume patching
         """
 
-        logging.info("- Set System Volume patching")
+        logging.info("Set System Volume patching")
         if "Library/InstallerSandboxes/" in str(self.constants.payload_path):
-            logging.info("- Running from Installer Sandbox")
+            logging.info("- Running from Installer Sandbox, blocking OS updaters")
             thread = threading.Thread(target=sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, None).start_patch)
             thread.start()
             while thread.is_alive():
@@ -75,7 +75,7 @@ class arguments:
         """
         Start root volume unpatching
         """
-        logging.info("- Set System Volume unpatching")
+        logging.info("Set System Volume unpatching")
         sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, None).start_unpatch()
 
 
@@ -84,7 +84,7 @@ class arguments:
         Start root volume auto patching
         """
 
-        logging.info("- Set Auto patching")
+        logging.info("Set Auto patching")
         sys_patch_auto.AutomaticSysPatch(self.constants).start_auto_patch()
 
 
@@ -92,6 +92,7 @@ class arguments:
         """
         Start config building process
         """
+        logging.info("Set OpenCore Build")
 
         if self.args.model:
             if self.args.model:

resources/build/build.py

@@ -113,7 +113,7 @@ class BuildOpenCore:
             self.config["#Revision"]["Hardware-Probe"] = pickle.dumps(computer_copy)
         else:
             self.config["#Revision"]["Build-Type"] = "OpenCore Built for External Machine"
-        self.config["#Revision"]["OpenCore-Version"] = f"{self.constants.opencore_version} - {self.constants.opencore_build} - {self.constants.opencore_commit}"
+        self.config["#Revision"]["OpenCore-Version"] = f"{self.constants.opencore_version} - {self.constants.opencore_build}"
         self.config["#Revision"]["Original-Model"] = self.model
         self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Version"] = f"{self.constants.patcher_version}"
         self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Model"] = self.model
@@ -153,5 +153,3 @@ class BuildOpenCore:
         logging.info(f"Your OpenCore EFI for {self.model} has been built at:")
         logging.info(f"    {self.constants.opencore_release_folder}")
         logging.info("")
-        if self.constants.gui_mode is False:
-            input("Press [Enter] to continue\n")

resources/build/firmware.py

@@ -73,7 +73,7 @@ class BuildFirmware:
             support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleIntelCPUPowerManagement.kext", self.constants.aicpupm_version, self.constants.aicpupm_path)
             support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleIntelCPUPowerManagementClient.kext", self.constants.aicpupm_version, self.constants.aicpupm_client_path)
 
-        if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value or self.constants.disable_xcpm is True:
+        if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value or self.constants.disable_fw_throttle is True:
             # With macOS 12.3 Beta 1, Apple dropped the 'plugin-type' check within X86PlatformPlugin
             # Because of this, X86PP will match onto the CPU instead of ACPI_SMC_PlatformPlugin
             # This causes power management to break on pre-Ivy Bridge CPUs as they don't have correct
@@ -81,11 +81,11 @@ class BuildFirmware:
             # This patch will simply increase ASPP's 'IOProbeScore' to outmatch X86PP
             logging.info("- Overriding ACPI SMC matching")
             support.BuildSupport(self.model, self.constants, self.config).enable_kext("ASPP-Override.kext", self.constants.aspp_override_version, self.constants.aspp_override_path)
-            if self.constants.disable_xcpm is True:
+            if self.constants.disable_fw_throttle is True:
                 # Only inject on older OSes if user requests
                 support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Add"], "BundlePath", "ASPP-Override.kext")["MinKernel"] = ""
 
-        if self.constants.disable_msr_power_ctl is True and smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.cpu_data.nehalem.value:
+        if self.constants.disable_fw_throttle is True and smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.cpu_data.nehalem.value:
             logging.info("- Disabling Firmware Throttling")
             # Nehalem and newer systems force firmware throttling via MSR_POWER_CTL
             support.BuildSupport(self.model, self.constants, self.config).enable_kext("SimpleMSR.kext", self.constants.simplemsr_version, self.constants.simplemsr_path)
@@ -220,17 +220,28 @@ class BuildFirmware:
 
         self._dual_dp_handling()
 
-        # Force VMM as a temporary solution to getting the MacPro6,1 booting in Ventura
-        # With macOS Ventura, Apple removed AppleIntelCPUPowerManagement.kext and assumed XCPM support across all Macs
-        # This change resulted in broken OS booting as the machine had no power management support
-        # Currently the AICPUPM fix is not fully functional, thus forcing VMM is a temporary solution
-        # Waiting for XNU source to be released to fix this properly
-        # Ref: https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/
-        if self.model in ["MacPro6,1", "iMac7,1", "iMac8,1", "MacBookPro4,1"] or self.constants.set_vmm_cpuid is True:
+        # Patches IOPCIConfigurator.cpp's IOPCIIsHotplugPort to skip configRead16/32 calls
+        # Credit to CaseySJ for original discovery:
+        # - Patch: https://github.com/AMD-OSX/AMD_Vanilla/pull/196
+        # - Source: https://github.com/apple-oss-distributions/IOPCIFamily/blob/main/IOPCIConfigurator.cpp#L968-L1022
+        #
+        # Currently all pre-Sandy Bridge Macs lacking an iGPU benefit from this patch as well as MacPro6,1
+        # Otherwise some graphics hardware will fail to wake, macOS will misreport hardware as ExpressCard-based,
+        # prevents MacPro6,1 from both booting unaccelerated and breaks low power states.
+        if (
+            self.model in ["MacPro6,1", "MacBookPro4,1"] or
+            (
+                smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.sandy_bridge.value and \
+                not self.model.startswith("MacBook")
+            )
+        ):
+            logging.info("- Adding PCI Bus Enumeration Patch")
+            support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "CaseySJ - Fix PCI bus enumeration")["Enabled"] = True
+
+        if self.constants.set_vmm_cpuid is True:
             logging.info("- Enabling VMM patch")
             self.config["Kernel"]["Emulate"]["Cpuid1Data"] = binascii.unhexlify("00000000000000000000008000000000")
             self.config["Kernel"]["Emulate"]["Cpuid1Mask"] = binascii.unhexlify("00000000000000000000008000000000")
-            self.config["Kernel"]["Emulate"]["MinKernel"] =  "22.0.0"
 
         if (
             self.model.startswith("MacBook")

resources/build/graphics_audio.py

@@ -259,7 +259,7 @@ class BuildGraphicsAudio:
                     "CAIL,CAIL_DisableUVDPowerGating": 1,
                     "CAIL,CAIL_DisableVCEPowerGating": 1,
                 })
-        if self.constants.imac_model == "Legacy GCN":
+        if self.constants.imac_model == "GCN":
             logging.info("- Adding Legacy GCN Power Gate Patches")
             self.config["DeviceProperties"]["Add"][backlight_path].update({
                 "CAIL,CAIL_DisableDrmdmaPowerGating": 1,
@@ -274,7 +274,7 @@ class BuildGraphicsAudio:
                     "CAIL,CAIL_DisableUVDPowerGating": 1,
                     "CAIL,CAIL_DisableVCEPowerGating": 1,
                 })
-        elif self.constants.imac_model == "AMD Lexa":
+        elif self.constants.imac_model == "Lexa":
             logging.info("- Adding Lexa Spoofing Patches")
             self.config["DeviceProperties"]["Add"][backlight_path].update({
                 "model": "AMD Radeon Pro WX 3200",
@@ -285,7 +285,7 @@ class BuildGraphicsAudio:
                     "model": "AMD Radeon Pro WX 3200",
                     "device-id": binascii.unhexlify("FF67"),
                 })
-        elif self.constants.imac_model == "AMD Navi":
+        elif self.constants.imac_model == "Navi":
             logging.info("- Adding Navi Spoofing Patches")
             navi_backlight_path = backlight_path+"/Pci(0x0,0x0)/Pci(0x0,0x0)"
             self.config["DeviceProperties"]["Add"][navi_backlight_path] = {

resources/build/misc.py

@@ -106,23 +106,6 @@ class BuildMiscellaneous:
             logging.info("- Disabling memory error reporting")
             re_block_args.append("pcie")
 
-        # Resolve mediaanalysisd crashing on 3802 GPUs
-        gpu_dict = [] if self.constants.custom_model else self.constants.computer.gpus
-        if gpu_dict == []:
-            gpu_dict = smbios_data.smbios_dictionary[self.model]["Stock GPUs"] if self.model in smbios_data.smbios_dictionary else []
-
-        for gpu in gpu_dict:
-            if not self.constants.custom_model:
-                gpu = gpu.arch
-            if gpu in [
-                device_probe.Intel.Archs.Ivy_Bridge,
-                device_probe.Intel.Archs.Haswell,
-                device_probe.NVIDIA.Archs.Kepler,
-            ]:
-                logging.info("- Disabling mediaanalysisd")
-                re_block_args.append("media")
-                break
-
         return re_block_args
 
 
@@ -192,19 +175,20 @@ class BuildMiscellaneous:
         Trackpad Handler
         """
 
-        # Pre-Force Touch trackpad support for macOS Ventura
+        # Pre-Force Touch trackpad & keyboard support for macOS Ventura
         if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.skylake.value:
             if self.model.startswith("MacBook"):
-                # These units got force touch early, so ignore them
+                # These units got force touch & the new keyboard mapping early, so ignore them
                 if self.model not in ["MacBookPro11,4", "MacBookPro11,5", "MacBookPro12,1", "MacBook8,1"]:
                     support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleUSBTopCase.kext", self.constants.topcase_version, self.constants.top_case_path)
                     support.BuildSupport(self.model, self.constants, self.config).get_kext_by_bundle_path("AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCButtons.kext")["Enabled"] = True
                     support.BuildSupport(self.model, self.constants, self.config).get_kext_by_bundle_path("AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyboard.kext")["Enabled"] = True
                     support.BuildSupport(self.model, self.constants, self.config).get_kext_by_bundle_path("AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyEventDriver.kext")["Enabled"] = True
                     support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleUSBMultitouch.kext", self.constants.multitouch_version, self.constants.multitouch_path)
-        # Legacy Trackpad support
+        # Legacy Trackpad & Keyboard support
         if self.model in ["MacBook4,1", "MacBook5,2"]:
             support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleUSBTrackpad.kext", self.constants.apple_trackpad, self.constants.apple_trackpad_path)
+            support.BuildSupport(self.model, self.constants, self.config).enable_kext("LegacyKeyboardInjector.kext", self.constants.legacy_keyboard, self.constants.legacy_keyboard_path) # Inject legacy personalities into AppleUSBTCKeyboard and AppleUSBTCKeyEventDriver
 
 
     def _thunderbolt_handling(self) -> None:

resources/build/support.py

@@ -136,7 +136,7 @@ class BuildSupport:
 
         for acpi in config_plist["ACPI"]["Add"]:
             if not Path(self.constants.opencore_release_folder / Path("EFI/OC/ACPI") / Path(acpi["Path"])).exists():
-                logging.info(f"  - Missing ACPI Table: {acpi['Path']}")
+                logging.info(f"- Missing ACPI Table: {acpi['Path']}")
                 raise Exception(f"Missing ACPI Table: {acpi['Path']}")
 
         for kext in config_plist["Kernel"]["Add"]:
@@ -155,19 +155,19 @@ class BuildSupport:
 
         for tool in config_plist["Misc"]["Tools"]:
             if not Path(self.constants.opencore_release_folder / Path("EFI/OC/Tools") / Path(tool["Path"])).exists():
-                logging.info(f"  - Missing tool: {tool['Path']}")
+                logging.info(f"- Missing tool: {tool['Path']}")
                 raise Exception(f"Missing tool: {tool['Path']}")
 
         for driver in config_plist["UEFI"]["Drivers"]:
             if not Path(self.constants.opencore_release_folder / Path("EFI/OC/Drivers") / Path(driver["Path"])).exists():
-                logging.info(f"  - Missing driver: {driver['Path']}")
+                logging.info(f"- Missing driver: {driver['Path']}")
                 raise Exception(f"Missing driver: {driver['Path']}")
 
         # Validating local files
         # Report if they have no associated config.plist entry (i.e. they're not being used)
         for tool_files in Path(self.constants.opencore_release_folder / Path("EFI/OC/Tools")).glob("*"):
             if tool_files.name not in [x["Path"] for x in config_plist["Misc"]["Tools"]]:
-                logging.info(f"  - Missing tool from config: {tool_files.name}")
+                logging.info(f"- Missing tool from config: {tool_files.name}")
                 raise Exception(f"Missing tool from config: {tool_files.name}")
 
         for driver_file in Path(self.constants.opencore_release_folder / Path("EFI/OC/Drivers")).glob("*"):

resources/constants.py

@@ -12,9 +12,10 @@ from data import os_data
 class Constants:
     def __init__(self) -> None:
         # Patcher Versioning
-        self.patcher_version:                 str = "0.6.3"  # OpenCore-Legacy-Patcher
-        self.patcher_support_pkg_version:     str = "0.9.3"  # PatcherSupportPkg
+        self.patcher_version:                 str = "0.6.7"  # OpenCore-Legacy-Patcher
+        self.patcher_support_pkg_version:     str = "1.1.2"  # PatcherSupportPkg
         self.copyright_date:                  str = "Copyright © 2020-2023 Dortania"
+        self.patcher_name:                    str = "OpenCore Legacy Patcher"
 
         # URLs
         self.url_patcher_support_pkg:         str = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
@@ -26,23 +27,22 @@ class Constants:
 
         # OpenCore Versioning
         # https://github.com/acidanthera/OpenCorePkg
-        self.opencore_commit:  str = "41b8aca - 04-03-2023"
-        self.opencore_version: str = "0.9.1"
+        self.opencore_version: str = "0.9.2"
 
         # Kext Versioning
         ## Acidanthera
         ## https://github.com/acidanthera
-        self.lilu_version:               str = "1.6.4"  #      Lilu
+        self.lilu_version:               str = "1.6.6"  #      Lilu
         self.whatevergreen_version:      str = "1.6.4"  #      WhateverGreen
         self.whatevergreen_navi_version: str = "1.6.4-Navi"  # WhateverGreen (Navi Patch)
         self.airportbcrmfixup_version:   str = "2.1.7"  #      AirPortBrcmFixup
         self.nvmefix_version:            str = "1.1.0"  #      NVMeFix
         self.applealc_version:           str = "1.6.3"  #      AppleALC
-        self.restrictevents_version:     str = "1.1.0"  #      RestrictEvents
+        self.restrictevents_version:     str = "1.1.1"  #      RestrictEvents
         self.featureunlock_version:      str = "1.1.4"  #      FeatureUnlock
         self.debugenhancer_version:      str = "1.0.7"  #      DebugEnhancer
         self.cpufriend_version:          str = "1.2.6"  #      CPUFriend
-        self.bluetool_version:           str = "2.6.5"  #      BlueToolFixup (BrcmPatchRAM)
+        self.bluetool_version:           str = "2.6.6"  #      BlueToolFixup (BrcmPatchRAM)
         self.cslvfixup_version:          str = "2.6.1"  #      CSLVFixup
         self.autopkg_version:            str = "1.0.2"  #      AutoPkgInstaller
         self.cryptexfixup_version:       str = "1.0.1"  #      CryptexFixup
@@ -105,15 +105,19 @@ class Constants:
         ## https://github.com/flagersgit/KDKlessWorkaround
         self.kdkless_version: str = "1.0.0"
 
+        ## Jazzzny
+        self.legacy_keyboard: str = "1.0.0"  # LegacyKeyboardInjector - Jazzzny
+
         # Get resource path
-        self.current_path: Path = Path(__file__).parent.parent.resolve()
-        self.payload_path: Path = self.current_path / Path("payloads")
+        self.current_path:  Path = Path(__file__).parent.parent.resolve()
+        self.original_path: Path = Path(__file__).parent.parent.resolve()
+        self.payload_path:  Path = self.current_path / Path("payloads")
 
         # Patcher Settings
         ## Internal settings
         self.allow_oc_everywhere:       bool = False  # Set whether Patcher can be run on unsupported Macs
         self.gui_mode:                  bool = False  # Determine whether running in a GUI or TUI
-        self.cli_mode:                  bool = False  # Determine if running in CLI mode
+        self.cli_mode:                  bool = True  #  Determine if running in CLI mode
         self.validate:                  bool = False  # Enable validation testing for CI
         self.recovery_status:           bool = False  # Detect if booted into RecoveryOS
         self.ignore_updates:            bool = False  # Ignore OCLP updates
@@ -129,6 +133,8 @@ class Constants:
         self.launcher_script:            str = None  #  Determine launch file path   (None if PyInstaller)
         self.booted_oc_disk:             str = None  #  Determine current disk OCLP booted from
         self.unpack_thread                   = None  #  Determine if unpack thread finished (threading.Thread)
+        self.update_stage:               int = 0  #     Determine update stage (see gui_support.py)
+        self.log_filepath:              Path = None  #  Path to log file
 
         self.commit_info: tuple = (None, None, None)  # Commit info (Branch, Commit Date, Commit URL)
 
@@ -203,13 +209,13 @@ class Constants:
         self.dGPU_switch:            bool = False  # Set Display GPU Switching for Windows
         self.force_surplus:          bool = False  # Force SurPlus patch in newer OSes
         self.force_latest_psp:       bool = False  # Force latest PatcherSupportPkg
-        self.disable_msr_power_ctl:  bool = False  # Disable MSR Power Control (missing battery throttling)
+        self.disable_fw_throttle:    bool = False  # Disable MSR Power Control and XCPM
         self.software_demux:         bool = False  # Enable Software Demux patch set
         self.force_vmm:              bool = False  # Force VMM patch
         self.disable_connectdrivers: bool = False  # Disable ConnectDrivers (hibernation)
         self.set_content_caching:    bool = False  # Set Content Caching
-        self.disable_xcpm:           bool = False  # Disable XCPM (X86PlatformPlugin.kext)
         self.set_vmm_cpuid:          bool = False  # Set VMM bit inside CPUID
+        self.disable_cat_colorsync:  bool = False  # Disable the ColorSync patch to regain Display Profiles
         self.set_alc_usage:          bool = True  #  Set AppleALC usage
         self.allow_3rd_party_drives: bool = True  #  Allow ThridPartyDrives quirk
         self.allow_nvme_fixing:      bool = True  #  Allow NVMe Kernel Space Patches
@@ -224,6 +230,17 @@ class Constants:
         ]
 
     # Payload Location
+
+    # Support Disk Images
+    @property
+    def payload_path_dmg(self):
+        return self.original_path / Path("payloads.dmg")
+
+    @property
+    def payload_local_binaries_root_path_dmg(self):
+        return self.original_path / Path("Universal-Binaries.dmg")
+
+
     # OpenCore
     @property
     def opencore_zip_source(self):
@@ -238,6 +255,10 @@ class Constants:
     def auto_patch_launch_agent_path(self):
         return self.payload_path / Path("com.dortania.opencore-legacy-patcher.auto-patch.plist")
 
+    @property
+    def rsr_monitor_launch_daemon_path(self):
+        return self.payload_path / Path("com.dortania.opencore-legacy-patcher.rsr-monitor.plist")
+
     # ACPI
     @property
     def pci_ssdt_path(self):
@@ -481,6 +502,10 @@ class Constants:
     def apple_isight_path(self):
         return self.payload_kexts_path / Path(f"Misc/LegacyUSBVideoSupport-v{self.apple_isight_version}.zip")
 
+    @property
+    def legacy_keyboard_path(self):
+        return self.payload_kexts_path / Path(f"Misc/LegacyKeyboardInjector-v{self.legacy_keyboard}.zip")
+
     @property
     def apple_raid_path(self):
         return self.payload_kexts_path / Path(f"Misc/AppleRAIDCard-v{self.apple_raid_version}.zip")
@@ -601,7 +626,7 @@ class Constants:
 
     @property
     def oclp_helper_path(self):
-        return self.payload_path / Path("Tools/OCLP-Helper")
+        return self.payload_path / Path("Tools/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher")
 
     @property
     def rsrrepair_userspace_path(self):
@@ -645,14 +670,16 @@ class Constants:
     def payload_local_binaries_root_path(self):
         return self.payload_path / Path("Universal-Binaries")
 
-    @property
-    def payload_local_binaries_root_path_zip(self):
-        return self.payload_path / Path("Universal-Binaries.zip")
-
     @property
     def kdk_download_path(self):
         return self.payload_path / Path("KDK.dmg")
 
+    @property
+    def icns_resource_path(self):
+        if self.launcher_script:
+            return self.payload_path / Path("Icon/AppIcons")
+        return Path(self.launcher_binary).parent.parent / Path("Resources")
+
 
     sbm_values = [
         "j137ap",  #  iMacPro1,1

resources/defaults.py

@@ -71,6 +71,14 @@ class GenerateDefaults:
                 global_settings.GlobalEnviromentSettings().write_property("MacBookPro_TeraScale_2_Accel", False)
                 self.constants.allow_ts2_accel = False
 
+        if self.model in ["MacBookAir4,1","MacBookAir4,2","MacBookPro8,1","MacBookPro8,2","MacBookPro8,3","Macmini5,1"]:
+            colorsync_status = global_settings.GlobalEnviromentSettings().read_property("Disable_ColorSync_Downgrade")
+            if colorsync_status is True:
+                self.constants.disable_cat_colorsync = True
+            else:
+                global_settings.GlobalEnviromentSettings().write_property("Disable_ColorSync_Downgrade", False)
+                self.constants.disable_cat_colorsync = False
+
         if self.model in smbios_data.smbios_dictionary:
             if smbios_data.smbios_dictionary[self.model]["CPU Generation"] >= cpu_data.cpu_data.skylake.value:
                 # On 2016-2017 MacBook Pros, 15" devices used a stock Samsung SSD with IONVMeController

resources/device_probe.py

@@ -6,6 +6,7 @@ import enum
 import itertools
 import subprocess
 import plistlib
+import hashlib
 from pathlib import Path
 from dataclasses import dataclass, field
 from typing import Any, ClassVar, Optional, Type, Union
@@ -52,7 +53,7 @@ class PCIDevice:
             if type(ioname) is bytes:
                 ioname = ioname.strip(b"\0").decode()
 
-            if ioname.startswith("pci"):
+            if ioname.startswith("pci") and "," in ioname:
                 vendor_id_unspoofed, device_id_unspoofed = (int(i, 16) for i in ioname[3:].split(","))
                 if anti_spoof:
                     vendor_id = vendor_id_unspoofed
@@ -491,6 +492,7 @@ class Computer:
     reported_model: Optional[str] = None
     reported_board_id: Optional[str] = None
     build_model: Optional[str] = None
+    uuid_sha1: Optional[str] = None
     gpus: list[GPU] = field(default_factory=list)
     igpu: Optional[GPU] = None  # Shortcut for IGPU
     dgpu: Optional[GPU] = None  # Shortcut for GFX0
@@ -719,6 +721,8 @@ class Computer:
         else:
             board = "board-id"
         self.reported_board_id = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, board, ioreg.kCFAllocatorDefault, ioreg.kNilOptions)).strip(b"\0").decode()  # type: ignore
+        self.uuid_sha1 = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, "IOPlatformUUID", ioreg.kCFAllocatorDefault, ioreg.kNilOptions))  # type: ignore
+        self.uuid_sha1 = hashlib.sha1(self.uuid_sha1.encode()).hexdigest()
         ioreg.IOObjectRelease(entry)
 
         # Real model

resources/global_settings.py

@@ -48,7 +48,7 @@ class GlobalEnviromentSettings:
             try:
                 plistlib.dump(plist, Path(self.global_settings_plist).open("wb"))
             except PermissionError:
-                logging.info("- Failed to write to global settings file")
+                logging.info("Failed to write to global settings file")
 
 
     def _generate_settings_file(self) -> None:
@@ -57,7 +57,7 @@ class GlobalEnviromentSettings:
         try:
             plistlib.dump({"Developed by Dortania": True,}, Path(self.global_settings_plist).open("wb"))
         except PermissionError:
-            logging.info("- Permission error: Unable to write to global settings file")
+            logging.info("Permission error: Unable to write to global settings file")
 
 
     def _convert_defaults_to_global_settings(self) -> None:
@@ -76,14 +76,15 @@ class GlobalEnviromentSettings:
             try:
                 plistlib.dump(global_settings_plist, Path(self.global_settings_plist).open("wb"))
             except PermissionError:
-                logging.info("- Permission error: Unable to write to global settings file")
+                logging.info("Permission error: Unable to write to global settings file")
                 return
 
             # delete defaults plist
             try:
                 Path(defaults_path).unlink()
-            except PermissionError:
-                logging.info("- Permission error: Unable to delete defaults plist")
+            except Exception as e:
+                logging.error("Error: Unable to delete defaults plist")
+                logging.error(e)
 
 
     def _fix_file_permission(self) -> None:
@@ -100,6 +101,6 @@ class GlobalEnviromentSettings:
         # Set file permission to allow any user to write to log file
         result = subprocess.run(["chmod", "777", self.global_settings_plist], capture_output=True)
         if result.returncode != 0:
-            logging.warning("- Failed to fix settings file permissions:")
+            logging.warning("Failed to fix settings file permissions:")
             if result.stderr:
                 logging.warning(result.stderr.decode("utf-8"))

resources/gui/gui_help.py

@@ -1,104 +0,0 @@
-import wx
-import webbrowser
-from resources import constants
-from data import os_data
-
-class gui_help_menu:
-    def __init__(self, versions, frame, frame_modal):
-        self.constants: constants.Constants = versions
-        self.frame = frame
-        self.frame_modal = frame_modal
-
-        # Define Window Size
-        self.WINDOW_WIDTH_MAIN  = 300
-
-
-    def reset_frame_modal(self):
-        if not self.frame_modal:
-            self.frame_modal = wx.Dialog(self.frame)
-        else:
-            self.frame_modal.DestroyChildren()
-            self.frame_modal.Close()
-            if self.constants.detected_os >= os_data.os_data.big_sur:
-                self.frame_modal.ShowWithoutActivating()
-
-    def help_menu(self, event=None):
-        # Define Menu
-        # Header: Get help with OpenCore Legacy Patcher
-        # Subheader: Following resources are available:
-        # Button: Official Guide
-        # Button: Official Discord Server
-
-        self.reset_frame_modal()
-        self.frame_modal.SetSize((self.WINDOW_WIDTH_MAIN, -1))
-
-        # Header
-        self.header = wx.StaticText(self.frame_modal, label="Patcher Resources", pos=(10,10))
-        self.header.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont"))
-        self.header.Centre(wx.HORIZONTAL)
-
-        # Subheader
-        self.subheader = wx.StaticText(self.frame_modal, label="Following resources are available:")
-        self.subheader.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
-        self.subheader.SetPosition(
-            wx.Point(
-                self.header.GetPosition().x,
-                self.header.GetPosition().y + self.header.GetSize().height + 5
-            )
-        )
-        self.subheader.Centre(wx.HORIZONTAL)
-
-
-        # Official Guide
-        self.guide = wx.Button(self.frame_modal, label="Official Guide", size=(200,30))
-        self.guide.SetPosition(
-            wx.Point(
-                self.subheader.GetPosition().x,
-                self.subheader.GetPosition().y + self.subheader.GetSize().height + 5
-
-            )
-        )
-        self.guide.Bind(wx.EVT_BUTTON, lambda event: webbrowser.open(self.constants.guide_link))
-        self.guide.Centre(wx.HORIZONTAL)
-
-        # Official Discord Server
-        self.discord = wx.Button(self.frame_modal, label="Official Discord Server", size=(200,30))
-        self.discord.SetPosition(
-            wx.Point(
-                self.guide.GetPosition().x,
-                self.guide.GetPosition().y + self.guide.GetSize().height
-            )
-        )
-        self.discord.Bind(wx.EVT_BUTTON, lambda event: webbrowser.open(self.constants.discord_link))
-        self.discord.Centre(wx.HORIZONTAL)
-
-        # Overclock Button
-        self.overclock = wx.Button(self.frame_modal, label="Official Support Phone", size=(200,30))
-        self.overclock.SetPosition(
-            wx.Point(
-                self.discord.GetPosition().x,
-                self.discord.GetPosition().y + self.discord.GetSize().height
-            )
-        )
-        self.overclock.Bind(wx.EVT_BUTTON, lambda event: webbrowser.open("https://www.youtube.com/watch?v=dQw4w9WgXcQ"))
-        self.overclock.Centre(wx.HORIZONTAL)
-
-
-        self.return_to_main = wx.Button(self.frame_modal, label="Return to Main Menu", size=(150,30))
-        self.return_to_main.SetPosition(
-            wx.Point(
-                self.overclock.GetPosition().x,
-                self.overclock.GetPosition().y + self.overclock.GetSize().height + 5
-            )
-        )
-        self.return_to_main.Bind(wx.EVT_BUTTON, lambda event: self.frame_modal.Close())
-        self.return_to_main.Centre(wx.HORIZONTAL)
-
-        # Set Window Size to below Copyright Label
-        self.frame_modal.SetSize(
-            (
-                -1,
-                self.return_to_main.GetPosition().y + self.return_to_main.GetSize().height + 40
-            )
-        )
-        self.frame_modal.ShowWindowModal()

resources/gui/menu_redirect.py

@@ -1,46 +0,0 @@
-import wx
-import time
-
-class RedirectText(object):
-    def __init__(self,aWxTextCtrl, sleep):
-        self.out=aWxTextCtrl
-        self.sleep = sleep
-
-    def write(self,string):
-        self.out.WriteText(string)
-        wx.GetApp().Yield()
-        if self.sleep:
-            time.sleep(0.01)
-
-    def fileno(self):
-        return 1
-
-    def flush(self):
-        pass
-
-class RedirectLabel(object):
-    def __init__(self,aWxTextCtrl):
-        self.out=aWxTextCtrl
-
-    def write(self,string):
-        if "MB/s" in string:
-            self.out.SetLabel(string)
-            self.out.Centre(wx.HORIZONTAL)
-        wx.GetApp().Yield()
-        time.sleep(0.01)
-
-    def fileno(self):
-        return 1
-
-    def flush(self):
-        pass
-
-class RedirectLabelAll(object):
-    def __init__(self,aWxTextCtrl):
-        self.out=aWxTextCtrl
-
-    def write(self,string):
-        self.out.SetLabel(string)
-        self.out.Centre(wx.HORIZONTAL)
-        wx.GetApp().Yield()
-        time.sleep(0.01)

resources/install.py

@@ -2,15 +2,17 @@
 # Usage solely for TUI
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
+import logging
 import plistlib
 import subprocess
-import shutil
-import os
-import logging
+import applescript
+
 from pathlib import Path
+
 from resources import utilities, constants
 from data import os_data
 
+
 class tui_disk_installation:
     def __init__(self, versions):
         self.constants: constants.Constants = versions
@@ -75,49 +77,37 @@ class tui_disk_installation:
         return supported_partitions
 
 
-    def install_opencore(self, full_disk_identifier):
-        def determine_sd_card(media_name):
-            # Array filled with common SD Card names
-            # Note most USB-based SD Card readers generally report as "Storage Device"
-            # Thus no reliable way to detect further without parsing IOService output (kUSBProductString)
-            if (
-                "SD Card" in media_name or \
-                "SD/MMC" in media_name or \
-                "SDXC Reader" in media_name or \
-                "SD Reader" in media_name or \
-                "Card Reader" in media_name
-            ):
-                return True
-            return False
+    def _determine_sd_card(self, media_name: str):
+        # Array filled with common SD Card names
+        # Note most USB-based SD Card readers generally report as "Storage Device"
+        # Thus no reliable way to detect further without parsing IOService output (kUSBProductString)
+        if any(x in media_name for x in ("SD Card", "SD/MMC", "SDXC Reader", "SD Reader", "Card Reader")):
+            return True
+        return False
 
+
+    def install_opencore(self, full_disk_identifier: str):
         # TODO: Apple Script fails in Yosemite(?) and older
-        args = [
-            "osascript",
-            "-e",
-            f'''do shell script "diskutil mount {full_disk_identifier}"'''
-            ' with prompt "OpenCore Legacy Patcher needs administrator privileges to mount your EFI."'
-            " with administrator privileges"
-            " without altering line endings",
-        ]
-
+        logging.info(f"Mounting partition: {full_disk_identifier}")
         if self.constants.detected_os >= os_data.os_data.el_capitan and not self.constants.recovery_status:
-            result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        else:
-            result = subprocess.run(f"diskutil mount {full_disk_identifier}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-        if result.returncode != 0:
-            if "execution error" in result.stderr.decode() and result.stderr.decode().strip()[-5:-1] == "-128":
-                # cancelled prompt
-                return
-            else:
-                logging.info("An error occurred!")
-                logging.info(result.stderr.decode())
-
-                # Check if we're in Safe Mode, and if so, tell user FAT32 is unsupported
+            try:
+                applescript.AppleScript(f'''do shell script "diskutil mount {full_disk_identifier}" with prompt "OpenCore Legacy Patcher needs administrator privileges to mount this volume." with administrator privileges without altering line endings''').run()
+            except applescript.ScriptError as e:
+                if "User canceled" in str(e):
+                    logging.info("Mount cancelled by user")
+                    return
+                logging.info(f"An error occurred: {e}")
                 if utilities.check_boot_mode() == "safe_boot":
                     logging.info("\nSafe Mode detected. FAT32 is unsupported by macOS in this mode.")
                     logging.info("Please disable Safe Mode and try again.")
+                    return
+        else:
+            result = subprocess.run(f"diskutil mount {full_disk_identifier}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            if result.returncode != 0:
+                logging.info("Mount failed")
+                logging.info(result.stderr.decode())
                 return
+
         partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {full_disk_identifier}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
         parent_disk = partition_info["ParentWholeDisk"]
         drive_host_info = plistlib.loads(subprocess.run(f"diskutil info -plist {parent_disk}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
@@ -128,71 +118,57 @@ class tui_disk_installation:
             ssd_type = False
         mount_path = Path(partition_info["MountPoint"])
         disk_type = partition_info["BusProtocol"]
-        utilities.cls()
-        utilities.header(["Copying OpenCore"])
 
-        if mount_path.exists():
-            if (mount_path / Path("EFI/Microsoft")).exists() and self.constants.gui_mode is False:
-                logging.info("- Found Windows Boot Loader")
-                logging.info("\nWould you like to continue installing OpenCore?")
-                logging.info("Installing OpenCore onto this drive may make Windows unbootable until OpenCore")
-                logging.info("is removed from the partition")
-                logging.info("We highly recommend users partition 200MB off their drive with Disk Utility")
-                logging.info("    Name:\t\t OPENCORE")
-                logging.info("    Format:\t\t FAT32")
-                logging.info("    Size:\t\t 200MB")
-                choice = input("\nWould you like to still install OpenCore to this drive?(y/n): ")
-                if not choice in ["y", "Y", "Yes", "yes"]:
-                    subprocess.run(["diskutil", "umount", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-                    return False
-            if (mount_path / Path("EFI/OC")).exists():
-                logging.info("- Removing preexisting EFI/OC folder")
-                shutil.rmtree(mount_path / Path("EFI/OC"), onerror=rmtree_handler)
-            if (mount_path / Path("System")).exists():
-                logging.info("- Removing preexisting System folder")
-                shutil.rmtree(mount_path / Path("System"), onerror=rmtree_handler)
-            if (mount_path / Path("boot.efi")).exists():
-                logging.info("- Removing preexisting boot.efi")
-                os.remove(mount_path / Path("boot.efi"))
-            logging.info("- Copying OpenCore onto EFI partition")
-            shutil.copytree(self.constants.opencore_release_folder / Path("EFI/OC"), mount_path / Path("EFI/OC"))
-            shutil.copytree(self.constants.opencore_release_folder / Path("System"), mount_path / Path("System"))
-            if Path(self.constants.opencore_release_folder / Path("boot.efi")).exists():
-                shutil.copy(self.constants.opencore_release_folder / Path("boot.efi"), mount_path / Path("boot.efi"))
-            if self.constants.boot_efi is True:
-                logging.info("- Converting Bootstrap to BOOTx64.efi")
-                if (mount_path / Path("EFI/BOOT")).exists():
-                    shutil.rmtree(mount_path / Path("EFI/BOOT"), onerror=rmtree_handler)
-                Path(mount_path / Path("EFI/BOOT")).mkdir()
-                shutil.move(mount_path / Path("System/Library/CoreServices/boot.efi"), mount_path / Path("EFI/BOOT/BOOTx64.efi"))
-                shutil.rmtree(mount_path / Path("System"), onerror=rmtree_handler)
-            if determine_sd_card(sd_type) is True:
-                logging.info("- Adding SD Card icon")
-                shutil.copy(self.constants.icon_path_sd, mount_path)
-            elif ssd_type is True:
-                logging.info("- Adding SSD icon")
-                shutil.copy(self.constants.icon_path_ssd, mount_path)
-            elif disk_type == "USB":
-                logging.info("- Adding External USB Drive icon")
-                shutil.copy(self.constants.icon_path_external, mount_path)
-            else:
-                logging.info("- Adding Internal Drive icon")
-                shutil.copy(self.constants.icon_path_internal, mount_path)
-
-            logging.info("- Cleaning install location")
-            if not self.constants.recovery_status:
-                logging.info("- Unmounting EFI partition")
-                subprocess.run(["diskutil", "umount", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            logging.info("- OpenCore transfer complete")
-            if self.constants.gui_mode is False:
-                logging.info("\nPress [Enter] to continue.\n")
-                input()
-        else:
+        if not mount_path.exists():
             logging.info("EFI failed to mount!")
             return False
-        return True
 
-def rmtree_handler(func, path, exc_info):
-    if exc_info[0] == FileNotFoundError:
-        return
-    raise  # pylint: disable=misplaced-bare-raise
+        if (mount_path / Path("EFI/OC")).exists():
+            logging.info("Removing preexisting EFI/OC folder")
+            subprocess.run(["rm", "-rf", mount_path / Path("EFI/OC")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        if (mount_path / Path("System")).exists():
+            logging.info("Removing preexisting System folder")
+            subprocess.run(["rm", "-rf", mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        if (mount_path / Path("boot.efi")).exists():
+            logging.info("Removing preexisting boot.efi")
+            subprocess.run(["rm", mount_path / Path("boot.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        logging.info("Copying OpenCore onto EFI partition")
+        subprocess.run(["mkdir", "-p", mount_path / Path("EFI")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run(["cp", "-r", self.constants.opencore_release_folder / Path("EFI/OC"), mount_path / Path("EFI/OC")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run(["cp", "-r", self.constants.opencore_release_folder / Path("System"), mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        if Path(self.constants.opencore_release_folder / Path("boot.efi")).exists():
+            subprocess.run(["cp", self.constants.opencore_release_folder / Path("boot.efi"), mount_path / Path("boot.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        if self.constants.boot_efi is True:
+            logging.info("Converting Bootstrap to BOOTx64.efi")
+            if (mount_path / Path("EFI/BOOT")).exists():
+                subprocess.run(["rm", "-rf", mount_path / Path("EFI/BOOT")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            Path(mount_path / Path("EFI/BOOT")).mkdir()
+            subprocess.run(["mv", mount_path / Path("System/Library/CoreServices/boot.efi"), mount_path / Path("EFI/BOOT/BOOTx64.efi")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run(["rm", "-rf", mount_path / Path("System")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        if self._determine_sd_card(sd_type) is True:
+            logging.info("Adding SD Card icon")
+            subprocess.run(["cp", self.constants.icon_path_sd, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        elif ssd_type is True:
+            logging.info("Adding SSD icon")
+            subprocess.run(["cp", self.constants.icon_path_ssd, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        elif disk_type == "USB":
+            logging.info("Adding External USB Drive icon")
+            subprocess.run(["cp", self.constants.icon_path_external, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        else:
+            logging.info("Adding Internal Drive icon")
+            subprocess.run(["cp", self.constants.icon_path_internal, mount_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        logging.info("Cleaning install location")
+        if not self.constants.recovery_status:
+            logging.info("Unmounting EFI partition")
+            subprocess.run(["diskutil", "umount", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+        logging.info("OpenCore transfer complete")
+
+        return True

resources/integrity_verification.py

@@ -9,6 +9,7 @@ import logging
 import binascii
 import threading
 
+from typing import Union
 from pathlib import Path
 
 CHUNK_LENGTH = 4 + 32
@@ -43,7 +44,7 @@ class ChunklistVerification:
         ...     print(chunk_obj.error_msg)
     """
 
-    def __init__(self, file_path: Path, chunklist_path: Path | bytes) -> None:
+    def __init__(self, file_path: Path, chunklist_path: Union[Path, bytes]) -> None:
         if isinstance(chunklist_path, bytes):
             self.chunklist_path: bytes = chunklist_path
         else:
@@ -59,7 +60,7 @@ class ChunklistVerification:
         self.status: ChunklistStatus = ChunklistStatus.IN_PROGRESS
 
 
-    def _generate_chunks(self, chunklist: Path | bytes) -> dict:
+    def _generate_chunks(self, chunklist: Union[Path, bytes]) -> dict:
         """
         Generate a dictionary of the chunklist header and chunks
 
@@ -99,6 +100,18 @@ class ChunklistVerification:
             self.status = ChunklistStatus.FAILURE
             return
 
+        if not Path(self.file_path).exists():
+            self.error_msg = f"File {self.file_path} does not exist"
+            self.status = ChunklistStatus.FAILURE
+            logging.info(self.error_msg)
+            return
+
+        if not Path(self.file_path).is_file():
+            self.error_msg = f"File {self.file_path} is not a file"
+            self.status = ChunklistStatus.FAILURE
+            logging.info(self.error_msg)
+            return
+
         with self.file_path.open("rb") as f:
             for chunk in self.chunks:
                 self.current_chunk += 1

resources/kdk_handler.py

@@ -94,7 +94,7 @@ class KernelDebugKitObject:
 
         global KDK_ASSET_LIST
 
-        logging.info("- Pulling KDK list from KdkSupportPkg API")
+        logging.info("Pulling KDK list from KdkSupportPkg API")
         if KDK_ASSET_LIST:
             return KDK_ASSET_LIST
 
@@ -107,11 +107,11 @@ class KernelDebugKitObject:
                 timeout=5
             )
         except (requests.exceptions.Timeout, requests.exceptions.TooManyRedirects, requests.exceptions.ConnectionError):
-            logging.info("- Could not contact KDK API")
+            logging.info("Could not contact KDK API")
             return None
 
         if results.status_code != 200:
-            logging.info("- Could not fetch KDK list")
+            logging.info("Could not fetch KDK list")
             return None
 
         KDK_ASSET_LIST = sorted(results.json(), key=lambda x: (packaging.version.parse(x["version"]), datetime.datetime.fromisoformat(x["date"])), reverse=True)
@@ -138,12 +138,12 @@ class KernelDebugKitObject:
 
         if os_data.os_conversion.os_to_kernel(str(parsed_version.major)) < os_data.os_data.ventura:
             self.error_msg = "KDKs are not required for macOS Monterey or older"
-            logging.warning(f"- {self.error_msg}")
+            logging.warning(f"{self.error_msg}")
             return
 
         self.kdk_installed_path = self._local_kdk_installed()
         if self.kdk_installed_path:
-            logging.info(f"- KDK already installed ({Path(self.kdk_installed_path).name}), skipping")
+            logging.info(f"KDK already installed ({Path(self.kdk_installed_path).name}), skipping")
             self.kdk_already_installed = True
             self.success = True
             return
@@ -151,44 +151,56 @@ class KernelDebugKitObject:
         remote_kdk_version = self._get_remote_kdks()
 
         if remote_kdk_version is None:
-            logging.warning("- Failed to fetch KDK list, falling back to local KDK matching")
+            logging.warning("Failed to fetch KDK list, falling back to local KDK matching")
 
             # First check if a KDK matching the current macOS version is installed
             # ex. 13.0.1 vs 13.0
             loose_version = f"{parsed_version.major}.{parsed_version.minor}"
-            logging.info(f"- Checking for KDKs loosely matching {loose_version}")
+            logging.info(f"Checking for KDKs loosely matching {loose_version}")
             self.kdk_installed_path = self._local_kdk_installed(match=loose_version, check_version=True)
             if self.kdk_installed_path:
-                logging.info(f"- Found matching KDK: {Path(self.kdk_installed_path).name}")
+                logging.info(f"Found matching KDK: {Path(self.kdk_installed_path).name}")
                 self.kdk_already_installed = True
                 self.success = True
                 return
 
             older_version = f"{parsed_version.major}.{parsed_version.minor - 1 if parsed_version.minor > 0 else 0}"
-            logging.info(f"- Checking for KDKs matching {older_version}")
+            logging.info(f"Checking for KDKs matching {older_version}")
             self.kdk_installed_path = self._local_kdk_installed(match=older_version, check_version=True)
             if self.kdk_installed_path:
-                logging.info(f"- Found matching KDK: {Path(self.kdk_installed_path).name}")
+                logging.info(f"Found matching KDK: {Path(self.kdk_installed_path).name}")
                 self.kdk_already_installed = True
                 self.success = True
                 return
 
-            logging.warning(f"- Couldn't find KDK matching {host_version} or {older_version}, please install one manually")
+            logging.warning(f"Couldn't find KDK matching {host_version} or {older_version}, please install one manually")
 
             self.error_msg = f"Could not contact KdkSupportPkg API, and no KDK matching {host_version} ({host_build}) or {older_version} was installed.\nPlease ensure you have a network connection or manually install a KDK."
 
             return
 
+        # First check exact match
         for kdk in remote_kdk_version:
-            kdk_version = cast(packaging.version.Version, packaging.version.parse(kdk["version"]))
-            if (kdk["build"] == host_build):
-                self.kdk_url = kdk["url"]
-                self.kdk_url_build = kdk["build"]
-                self.kdk_url_version = kdk["version"]
-                self.kdk_url_expected_size = kdk["fileSize"]
-                self.kdk_url_is_exactly_match = True
-                break
-            if kdk_version <= parsed_version and kdk_version.major == parsed_version.major and (kdk_version.minor in range(parsed_version.minor - 1, parsed_version.minor + 1)):
+            if (kdk["build"] != host_build):
+                continue
+            self.kdk_url = kdk["url"]
+            self.kdk_url_build = kdk["build"]
+            self.kdk_url_version = kdk["version"]
+            self.kdk_url_expected_size = kdk["fileSize"]
+            self.kdk_url_is_exactly_match = True
+            break
+
+        # If no exact match, check for closest match
+        if self.kdk_url == "":
+            for kdk in remote_kdk_version:
+                kdk_version = cast(packaging.version.Version, packaging.version.parse(kdk["version"]))
+                if kdk_version > parsed_version:
+                    continue
+                if kdk_version.major != parsed_version.major:
+                    continue
+                if kdk_version.minor not in range(parsed_version.minor - 1, parsed_version.minor + 1):
+                    continue
+
                 # The KDK list is already sorted by version then date, so the first match is the closest
                 self.kdk_closest_match_url = kdk["url"]
                 self.kdk_closest_match_url_build = kdk["build"]
@@ -199,32 +211,32 @@ class KernelDebugKitObject:
 
         if self.kdk_url == "":
             if self.kdk_closest_match_url == "":
-                logging.warning(f"- No KDKs found for {host_build} ({host_version})")
+                logging.warning(f"No KDKs found for {host_build} ({host_version})")
                 self.error_msg = f"No KDKs found for {host_build} ({host_version})"
                 return
-            logging.info(f"- No direct match found for {host_build}, falling back to closest match")
-            logging.info(f"- Closest Match: {self.kdk_closest_match_url_build} ({self.kdk_closest_match_url_version})")
+            logging.info(f"No direct match found for {host_build}, falling back to closest match")
+            logging.info(f"Closest Match: {self.kdk_closest_match_url_build} ({self.kdk_closest_match_url_version})")
 
             self.kdk_url = self.kdk_closest_match_url
             self.kdk_url_build = self.kdk_closest_match_url_build
             self.kdk_url_version = self.kdk_closest_match_url_version
             self.kdk_url_expected_size = self.kdk_closest_match_url_expected_size
         else:
-            logging.info(f"- Direct match found for {host_build} ({host_version})")
+            logging.info(f"Direct match found for {host_build} ({host_version})")
 
 
         # Check if this KDK is already installed
         self.kdk_installed_path = self._local_kdk_installed(match=self.kdk_url_build)
         if self.kdk_installed_path:
-            logging.info(f"- KDK already installed ({Path(self.kdk_installed_path).name}), skipping")
+            logging.info(f"KDK already installed ({Path(self.kdk_installed_path).name}), skipping")
             self.kdk_already_installed = True
             self.success = True
             return
 
-        logging.info("- Following KDK is recommended:")
-        logging.info(f"-   KDK Build: {self.kdk_url_build}")
-        logging.info(f"-   KDK Version: {self.kdk_url_version}")
-        logging.info(f"-   KDK URL: {self.kdk_url}")
+        logging.info("Following KDK is recommended:")
+        logging.info(f"- KDK Build: {self.kdk_url_build}")
+        logging.info(f"- KDK Version: {self.kdk_url_version}")
+        logging.info(f"- KDK URL: {self.kdk_url}")
 
         self.success = True
 
@@ -244,7 +256,7 @@ class KernelDebugKitObject:
         self.error_msg = ""
 
         if self.kdk_already_installed:
-            logging.info("- No download required, KDK already installed")
+            logging.info("No download required, KDK already installed")
             self.success = True
             return None
 
@@ -253,7 +265,7 @@ class KernelDebugKitObject:
             logging.error(self.error_msg)
             return None
 
-        logging.info(f"- Returning DownloadObject for KDK: {Path(self.kdk_url).name}")
+        logging.info(f"Returning DownloadObject for KDK: {Path(self.kdk_url).name}")
         self.success = True
 
         kdk_download_path = self.constants.kdk_download_path if override_path == "" else Path(override_path)
@@ -282,7 +294,7 @@ class KernelDebugKitObject:
             plist_path.touch()
             plistlib.dump(kdk_dict, plist_path.open("wb"), sort_keys=False)
         except Exception as e:
-            logging.error(f"- Failed to generate KDK Info.plist: {e}")
+            logging.error(f"Failed to generate KDK Info.plist: {e}")
 
 
     def _local_kdk_valid(self, kdk_path: Path) -> bool:
@@ -302,14 +314,14 @@ class KernelDebugKitObject:
         """
 
         if not Path(f"{kdk_path}/System/Library/CoreServices/SystemVersion.plist").exists():
-            logging.info(f"- Corrupted KDK found ({kdk_path.name}), removing due to missing SystemVersion.plist")
+            logging.info(f"Corrupted KDK found ({kdk_path.name}), removing due to missing SystemVersion.plist")
             self._remove_kdk(kdk_path)
             return False
 
         # Get build from KDK
         kdk_plist_data = plistlib.load(Path(f"{kdk_path}/System/Library/CoreServices/SystemVersion.plist").open("rb"))
         if "ProductBuildVersion" not in kdk_plist_data:
-            logging.info(f"- Corrupted KDK found ({kdk_path.name}), removing due to missing ProductBuildVersion")
+            logging.info(f"Corrupted KDK found ({kdk_path.name}), removing due to missing ProductBuildVersion")
             self._remove_kdk(kdk_path)
             return False
 
@@ -319,7 +331,7 @@ class KernelDebugKitObject:
         result = subprocess.run(["pkgutil", "--files", f"com.apple.pkg.KDK.{kdk_build}"], capture_output=True)
         if result.returncode != 0:
             # If pkg receipt is missing, we'll fallback to legacy validation
-            logging.info(f"- pkg receipt missing for {kdk_path.name}, falling back to legacy validation")
+            logging.info(f"pkg receipt missing for {kdk_path.name}, falling back to legacy validation")
             return self._local_kdk_valid_legacy(kdk_path)
 
         # Go through each line of the pkg receipt and ensure it exists
@@ -327,7 +339,7 @@ class KernelDebugKitObject:
             if not line.startswith("System/Library/Extensions"):
                 continue
             if not Path(f"{kdk_path}/{line}").exists():
-                logging.info(f"- Corrupted KDK found ({kdk_path.name}), removing due to missing file: {line}")
+                logging.info(f"Corrupted KDK found ({kdk_path.name}), removing due to missing file: {line}")
                 self._remove_kdk(kdk_path)
                 return False
 
@@ -356,7 +368,7 @@ class KernelDebugKitObject:
 
         for kext in KEXT_CATALOG:
             if not Path(f"{kdk_path}/System/Library/Extensions/{kext}").exists():
-                logging.info(f"- Corrupted KDK found, removing due to missing: {kdk_path}/System/Library/Extensions/{kext}")
+                logging.info(f"Corrupted KDK found, removing due to missing: {kdk_path}/System/Library/Extensions/{kext}")
                 self._remove_kdk(kdk_path)
                 return False
 
@@ -415,15 +427,15 @@ class KernelDebugKitObject:
                 if not kdk_pkg.name.endswith(f"{match}.pkg"):
                     continue
 
-            logging.info(f"- Found KDK backup: {kdk_pkg.name}")
+            logging.info(f"Found KDK backup: {kdk_pkg.name}")
             if self.passive is False:
-                logging.info("- Attempting KDK restoration")
+                logging.info("Attempting KDK restoration")
                 if KernelDebugKitUtilities().install_kdk_pkg(kdk_pkg):
-                    logging.info("- Successfully restored KDK")
+                    logging.info("Successfully restored KDK")
                     return self._local_kdk_installed(match=match, check_version=check_version)
             else:
                 # When in passive mode, we're just checking if a KDK could be restored
-                logging.info("- KDK restoration skipped, running in passive mode")
+                logging.info("KDK restoration skipped, running in passive mode")
                 return kdk_pkg
 
         return None
@@ -441,22 +453,22 @@ class KernelDebugKitObject:
             return
 
         if os.getuid() != 0:
-            logging.warning("- Cannot remove KDK, not running as root")
+            logging.warning("Cannot remove KDK, not running as root")
             return
 
         if not Path(kdk_path).exists():
-            logging.warning(f"- KDK does not exist: {kdk_path}")
+            logging.warning(f"KDK does not exist: {kdk_path}")
             return
 
         rm_args = ["rm", "-rf" if Path(kdk_path).is_dir() else "-f", kdk_path]
 
         result = utilities.elevated(rm_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         if result.returncode != 0:
-            logging.warning(f"- Failed to remove KDK: {kdk_path}")
-            logging.warning(f"- {result.stdout.decode('utf-8')}")
+            logging.warning(f"Failed to remove KDK: {kdk_path}")
+            logging.warning(f"{result.stdout.decode('utf-8')}")
             return
 
-        logging.info(f"- Successfully removed KDK: {kdk_path}")
+        logging.info(f"Successfully removed KDK: {kdk_path}")
 
 
     def _remove_unused_kdks(self, exclude_builds: list = None) -> None:
@@ -483,7 +495,7 @@ class KernelDebugKitObject:
         if not Path(KDK_INSTALL_PATH).exists():
             return
 
-        logging.info("- Cleaning unused KDKs")
+        logging.info("Cleaning unused KDKs")
         for kdk_folder in Path(KDK_INSTALL_PATH).iterdir():
             if kdk_folder.name.endswith(".kdk") or kdk_folder.name.endswith(".pkg"):
                 should_remove = True
@@ -520,16 +532,18 @@ class KernelDebugKitObject:
         # TODO: should we use the checksum from the API?
         result = subprocess.run(["hdiutil", "verify", self.constants.kdk_download_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         if result.returncode != 0:
-            logging.info("- Error: Kernel Debug Kit checksum verification failed!")
-            logging.info(f"- Output: {result.stderr.decode('utf-8')}")
+            logging.info("Error: Kernel Debug Kit checksum verification failed!")
+            logging.info(f"Output: {result.stderr.decode('utf-8')}")
             msg = "Kernel Debug Kit checksum verification failed, please try again.\n\nIf this continues to fail, ensure you're downloading on a stable network connection (ie. Ethernet)"
-            logging.info(f"- {msg}")
+            logging.info(f"{msg}")
 
             self.error_msg = msg
+            return False
 
         self._remove_unused_kdks()
-
         self.success = True
+        logging.info("Kernel Debug Kit checksum verified")
+        return True
 
 
 class KernelDebugKitUtilities:
@@ -554,17 +568,17 @@ class KernelDebugKitUtilities:
         """
 
         if os.getuid() != 0:
-            logging.warning("- Cannot install KDK, not running as root")
+            logging.warning("Cannot install KDK, not running as root")
             return False
 
-        logging.info(f"- Installing KDK package: {kdk_path.name}")
-        logging.info(f"  - This may take a while...")
+        logging.info(f"Installing KDK package: {kdk_path.name}")
+        logging.info(f"- This may take a while...")
 
         # TODO: Check whether enough disk space is available
 
         result = utilities.elevated(["installer", "-pkg", kdk_path, "-target", "/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         if result.returncode != 0:
-            logging.info("- Failed to install KDK:")
+            logging.info("Failed to install KDK:")
             logging.info(result.stdout.decode('utf-8'))
             if result.stderr:
                 logging.info(result.stderr.decode('utf-8'))
@@ -585,21 +599,21 @@ class KernelDebugKitUtilities:
         """
 
         if os.getuid() != 0:
-            logging.warning("- Cannot install KDK, not running as root")
+            logging.warning("Cannot install KDK, not running as root")
             return False
 
-        logging.info(f"- Extracting downloaded KDK disk image")
+        logging.info(f"Extracting downloaded KDK disk image")
         with tempfile.TemporaryDirectory() as mount_point:
             result = subprocess.run(["hdiutil", "attach", kdk_path, "-mountpoint", mount_point, "-nobrowse"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             if result.returncode != 0:
-                logging.info("- Failed to mount KDK:")
+                logging.info("Failed to mount KDK:")
                 logging.info(result.stdout.decode('utf-8'))
                 return False
 
             kdk_pkg_path = Path(f"{mount_point}/KernelDebugKit.pkg")
 
             if not kdk_pkg_path.exists():
-                logging.warning("- Failed to find KDK package in DMG, likely corrupted!!!")
+                logging.warning("Failed to find KDK package in DMG, likely corrupted!!!")
                 self._unmount_disk_image(mount_point)
                 return False
 
@@ -610,7 +624,7 @@ class KernelDebugKitUtilities:
             self._create_backup(kdk_pkg_path, Path(f"{kdk_path.parent}/{KDK_INFO_PLIST}"))
             self._unmount_disk_image(mount_point)
 
-        logging.info("- Successfully installed KDK")
+        logging.info("Successfully installed KDK")
         return True
 
     def _unmount_disk_image(self, mount_point) -> None:
@@ -633,31 +647,31 @@ class KernelDebugKitUtilities:
         """
 
         if not kdk_path.exists():
-            logging.warning("- KDK does not exist, cannot create backup")
+            logging.warning("KDK does not exist, cannot create backup")
             return
         if not kdk_info_plist.exists():
-            logging.warning("- KDK Info.plist does not exist, cannot create backup")
+            logging.warning("KDK Info.plist does not exist, cannot create backup")
             return
 
         kdk_info_dict = plistlib.load(kdk_info_plist.open("rb"))
 
         if 'version' not in kdk_info_dict or 'build' not in kdk_info_dict:
-            logging.warning("- Malformed KDK Info.plist provided, cannot create backup")
+            logging.warning("Malformed KDK Info.plist provided, cannot create backup")
             return
 
         if os.getuid() != 0:
-            logging.warning("- Cannot create KDK backup, not running as root")
+            logging.warning("Cannot create KDK backup, not running as root")
             return
 
         kdk_dst_name = f"KDK_{kdk_info_dict['version']}_{kdk_info_dict['build']}.pkg"
         kdk_dst_path = Path(f"{KDK_INSTALL_PATH}/{kdk_dst_name}")
 
-        logging.info(f"- Creating backup: {kdk_dst_name}")
+        logging.info(f"Creating backup: {kdk_dst_name}")
         if kdk_dst_path.exists():
-            logging.info("- Backup already exists, skipping")
+            logging.info("Backup already exists, skipping")
             return
 
         result = utilities.elevated(["cp", "-R", kdk_path, kdk_dst_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         if result.returncode != 0:
-            logging.info("- Failed to create KDK backup:")
+            logging.info("Failed to create KDK backup:")
             logging.info(result.stdout.decode('utf-8'))

resources/logging_handler.py

@@ -1,9 +1,16 @@
-import logging
-import sys
-import threading
 import os
+import sys
+import pprint
+import logging
+import threading
+import traceback
 import subprocess
+import applescript
+
 from pathlib import Path
+from datetime import datetime
+
+from resources import constants, analytics_handler, global_settings
 
 
 class InitializeLoggingSupport:
@@ -26,25 +33,26 @@ class InitializeLoggingSupport:
 
     """
 
-    def __init__(self) -> None:
-        self.log_filename: str  = "OpenCore-Patcher.log"
+    def __init__(self, global_constants: constants.Constants) -> None:
+        self.constants: constants.Constants = global_constants
+
+        log_time = datetime.now().strftime("%Y-%m-%d_%H-%M-%S-%f")
+
+        self.log_filename: str  = f"OpenCore-Patcher_{self.constants.patcher_version}_{log_time}.log"
         self.log_filepath: Path = None
 
         self.original_excepthook:        sys       = sys.excepthook
         self.original_thread_excepthook: threading = threading.excepthook
 
-        self.max_file_size:     int = 1024 * 1024 * 10  # 10 MB
-        self.file_size_redline: int = 1024 * 1024 * 9   # 9 MB, when to start cleaning log file
+        self.max_file_size:     int = 1024 * 1024               # 1 MB
+        self.file_size_redline: int = 1024 * 1024 - 1024 * 100  # 900 KB, when to start cleaning log file
 
         self._initialize_logging_path()
-        self._clean_log_file()
         self._attempt_initialize_logging_configuration()
+        self._start_logging()
         self._implement_custom_traceback_handler()
         self._fix_file_permission()
-
-
-    def __del__(self) -> None:
-        self._restore_original_excepthook()
+        self._clean_prior_version_logs()
 
 
     def _initialize_logging_path(self) -> None:
@@ -52,39 +60,57 @@ class InitializeLoggingSupport:
         Initialize logging framework storage path
         """
 
-        self.log_filepath = Path(f"~/Library/Logs/{self.log_filename}").expanduser()
+        base_path = Path("~/Library/Logs").expanduser()
+        if not base_path.exists():
+            # Likely in an installer environment, store in /Users/Shared
+            base_path = Path("/Users/Shared")
+        else:
+            # create Dortania folder if it doesn't exist
+            base_path = base_path / "Dortania"
+            if not base_path.exists():
+                try:
+                    base_path.mkdir()
+                except Exception as e:
+                    logging.error(f"Failed to create Dortania folder: {e}")
+                    base_path = Path("/Users/Shared")
 
-        if not self.log_filepath.parent.exists():
-             # Likely in an installer environment, store in /Users/Shared
-            self.log_filepath = Path("/Users/Shared") / self.log_filename
+        self.log_filepath = Path(f"{base_path}/{self.log_filename}").expanduser()
+        self.constants.log_filepath = self.log_filepath
 
-        print("- Initializing logging framework...")
-        print(f"  - Log file: {self.log_filepath}")
-
-
-    def _clean_log_file(self) -> None:
+    def _clean_prior_version_logs(self) -> None:
         """
-        Determine if log file should be cleaned
+        Clean logs from old Patcher versions
 
-        We check if we're near the max file size, and if so, we clean the log file
+        Keep 10 latest logs
         """
 
-        if not self.log_filepath.exists():
-            return
+        paths = [
+            self.log_filepath.parent,        # ~/Library/Logs/Dortania
+            self.log_filepath.parent.parent, # ~/Library/Logs (old location)
+        ]
 
-        if self.log_filepath.stat().st_size < self.file_size_redline:
-            return
+        logs = []
 
-        # Check if backup log file exists
-        backup_log_filepath = self.log_filepath.with_suffix(".old.log")
-        try:
-            if backup_log_filepath.exists():
-                backup_log_filepath.unlink()
+        for path in paths:
+            for file in path.glob("OpenCore-Patcher*"):
+                if not file.is_file():
+                    continue
 
-            # Rename current log file to backup log file
-            self.log_filepath.rename(backup_log_filepath)
-        except Exception as e:
-            print(f"- Failed to clean log file: {e}")
+                if not file.name.endswith(".log"):
+                    continue
+
+                if file.name == self.log_filename:
+                    continue
+
+                logs.append(file)
+
+        logs.sort(key=lambda x: x.stat().st_mtime, reverse=True)
+
+        for log in logs[9:]:
+            try:
+                log.unlink()
+            except Exception as e:
+                logging.error(f"Failed to delete log file: {e}")
 
 
     def _fix_file_permission(self) -> None:
@@ -98,11 +124,21 @@ class InitializeLoggingSupport:
         if os.geteuid() != 0:
             return
 
-        result = subprocess.run(["chmod", "777", self.log_filepath], capture_output=True)
-        if result.returncode != 0:
-            print(f"- Failed to fix log file permissions")
-            if result.stderr:
-                print(result.stderr.decode("utf-8"))
+        paths = [
+            self.log_filepath,        # ~/Library/Logs/Dortania/OpenCore-Patcher_{version}_{date}.log
+            self.log_filepath.parent, # ~/Library/Logs/Dortania
+        ]
+
+        for path in paths:
+            result = subprocess.run(["chmod", "777", path], capture_output=True)
+            if result.returncode != 0:
+                logging.error(f"Failed to fix log file permissions")
+                if result.stdout:
+                    logging.error("STDOUT:")
+                    logging.error(result.stdout.decode("utf-8"))
+                if result.stderr:
+                    logging.error("STDERR:")
+                    logging.error(result.stderr.decode("utf-8"))
 
 
     def _initialize_logging_configuration(self, log_to_file: bool = True) -> None:
@@ -119,7 +155,7 @@ class InitializeLoggingSupport:
 
         logging.basicConfig(
             level=logging.NOTSET,
-            format="%(asctime)s - %(filename)s (%(lineno)d): %(message)s",
+            format="[%(asctime)s] [%(filename)-32s] [%(lineno)-4d]: %(message)s",
             handlers=[
                 logging.StreamHandler(stream = sys.stdout),
                 logging.FileHandler(self.log_filepath) if log_to_file is True else logging.NullHandler()
@@ -140,11 +176,32 @@ class InitializeLoggingSupport:
         try:
             self._initialize_logging_configuration()
         except Exception as e:
-            print(f"- Failed to initialize logging framework: {e}")
-            print("- Retrying without logging to file...")
+            print(f"Failed to initialize logging framework: {e}")
+            print("Retrying without logging to file...")
             self._initialize_logging_configuration(log_to_file=False)
 
 
+    def _start_logging(self):
+        """
+        Start logging, used as easily identifiable start point in logs
+        """
+
+        str_msg = f"# OpenCore Legacy Patcher ({self.constants.patcher_version}) #"
+        str_len = len(str_msg)
+
+        logging.info('#' * str_len)
+        logging.info(str_msg)
+        logging.info('#' * str_len)
+
+        logging.info("Log file set:")
+        # Display relative path to avoid disclosing user's username
+        try:
+            path = self.log_filepath.relative_to(Path.home())
+            logging.info(f"~/{path}")
+        except ValueError:
+            logging.info(self.log_filepath)
+
+
     def _implement_custom_traceback_handler(self) -> None:
         """
         Reroute traceback to logging module
@@ -155,6 +212,49 @@ class InitializeLoggingSupport:
             Reroute traceback in main thread to logging module
             """
             logging.error("Uncaught exception in main thread", exc_info=(type, value, tb))
+            self._display_debug_properties()
+
+            if "wx/" in "".join(traceback.format_exception(type, value, tb)):
+                # Likely a GUI error, don't display error dialog
+                return
+
+            if self.constants.cli_mode is True:
+                threading.Thread(target=analytics_handler.Analytics(self.constants).send_crash_report, args=(self.log_filepath,)).start()
+                return
+
+            error_msg = f"OpenCore Legacy Patcher encountered the following internal error:\n\n"
+            error_msg += f"{type.__name__}: {value}"
+            if tb:
+                error_msg += f"\n\n{traceback.extract_tb(tb)[-1]}"
+
+            cant_log: bool = global_settings.GlobalEnviromentSettings().read_property("DisableCrashAndAnalyticsReporting")
+            if not isinstance(cant_log, bool):
+                cant_log = False
+
+            if self.constants.commit_info[0].startswith("refs/tags"):
+                cant_log = True
+
+            if cant_log is True:
+                error_msg += "\n\nReveal log file?"
+            else:
+                error_msg += "\n\nSend crash report to Dortania?"
+
+            # Ask user if they want to send crash report
+            try:
+                result = applescript.AppleScript(f'display dialog "{error_msg}" with title "OpenCore Legacy Patcher ({self.constants.patcher_version})" buttons {{"Yes", "No"}} default button "Yes" with icon caution').run()
+            except Exception as e:
+                logging.error(f"Failed to display crash report dialog: {e}")
+                return
+
+            if result[applescript.AEType(b'bhit')] != "Yes":
+                return
+
+            if cant_log is True:
+                subprocess.run(["open", "--reveal", self.log_filepath])
+                return
+
+            threading.Thread(target=analytics_handler.Analytics(self.constants).send_crash_report, args=(self.log_filepath,)).start()
+
 
         def custom_thread_excepthook(args) -> None:
             """
@@ -173,3 +273,23 @@ class InitializeLoggingSupport:
 
         sys.excepthook = self.original_excepthook
         threading.excepthook = self.original_thread_excepthook
+
+
+    def _display_debug_properties(self) -> None:
+        """
+        Display debug properties, primarily after main thread crash
+        """
+        logging.info("Host Properties:")
+        logging.info(f"  XNU Version: {self.constants.detected_os}.{self.constants.detected_os_minor}")
+        logging.info(f"  XNU Build: {self.constants.detected_os_build}")
+        logging.info(f"  macOS Version: {self.constants.detected_os_version}")
+        logging.info("Debug Properties:")
+        logging.info(f"  Effective User ID: {os.geteuid()}")
+        logging.info(f"  Effective Group ID: {os.getegid()}")
+        logging.info(f"  Real User ID: {os.getuid()}")
+        logging.info(f"  Real Group ID: {os.getgid()}")
+        logging.info("  Arguments passed to Patcher:")
+        for arg in sys.argv:
+            logging.info(f"    {arg}")
+
+        logging.info(f"Host Properties:\n{pprint.pformat(self.constants.computer.__dict__, indent=4)}")

resources/macos_installer_handler.py

@@ -6,6 +6,7 @@ import subprocess
 import tempfile
 import enum
 import logging
+import applescript
 
 from data import os_data
 from resources import network_handler, utilities
@@ -13,10 +14,24 @@ from resources import network_handler, utilities
 
 APPLICATION_SEARCH_PATH:  str = "/Applications"
 SFR_SOFTWARE_UPDATE_PATH: str = "SFR/com_apple_MobileAsset_SFRSoftwareUpdate/com_apple_MobileAsset_SFRSoftwareUpdate.xml"
-
-CATALOG_URL_BASE:      str = "https://swscan.apple.com/content/catalogs/others/index"
-CATALOG_URL_EXTENSION: str = "13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
-CATALOG_URL_VERSION:   str = "13"
+CATALOG_URL_BASE:         str = "https://swscan.apple.com/content/catalogs/others/index"
+CATALOG_URL_EXTENSION:    str = ".merged-1.sucatalog"
+CATALOG_URL_VARIANTS:     list = [
+    "13",
+    "12",
+    "10.16",
+    "10.15",
+    "10.14",
+    "10.13",
+    "10.12",
+    "10.11",
+    "10.10",
+    "10.9",
+    "mountainlion",
+    "lion",
+    "snowleopard",
+    "leopard",
+]
 
 tmp_dir = tempfile.TemporaryDirectory()
 
@@ -38,23 +53,20 @@ class InstallerCreation():
             bool: True if successful, False otherwise
         """
 
-        logging.info("- Extracting macOS installer from InstallAssistant.pkg\n  This may take some time")
-        args = [
-            "osascript",
-            "-e",
-            f'''do shell script "installer -pkg {Path(download_path)}/InstallAssistant.pkg -target /"'''
-            ' with prompt "OpenCore Legacy Patcher needs administrator privileges to add InstallAssistant."'
-            " with administrator privileges"
-            " without altering line endings",
-        ]
-
-        result = subprocess.run(args,stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        if result.returncode != 0:
-            logging.info("- Failed to install InstallAssistant")
-            logging.info(f"  Error Code: {result.returncode}")
+        logging.info("Extracting macOS installer from InstallAssistant.pkg")
+        try:
+            applescript.AppleScript(
+                f'''do shell script "installer -pkg {Path(download_path)}/InstallAssistant.pkg -target /"'''
+                ' with prompt "OpenCore Legacy Patcher needs administrator privileges to extract the installer."'
+                " with administrator privileges"
+                " without altering line endings",
+            ).run()
+        except Exception as e:
+            logging.info("Failed to install InstallAssistant")
+            logging.info(f"  Error Code: {e}")
             return False
 
-        logging.info("- InstallAssistant installed")
+        logging.info("InstallAssistant installed")
         return True
 
 
@@ -189,7 +201,6 @@ fi
             if not any(all_disks[disk]['removable'] is False for partition in all_disks[disk]):
                 continue
 
-            logging.info(f"disk {disk}: {all_disks[disk]['name']} ({utilities.human_fmt(all_disks[disk]['size'])})")
             list_disks.update({
                 disk: {
                     "identifier": all_disks[disk]["identifier"],
@@ -222,15 +233,15 @@ class RemoteInstallerCatalog:
     Parses Apple's Software Update catalog and finds all macOS installers.
     """
 
-    def __init__(self, seed_override: SeedType = SeedType.PublicRelease) -> None:
+    def __init__(self, seed_override: SeedType = SeedType.PublicRelease, os_override: int = os_data.os_data.ventura) -> None:
 
-        self.catalog_url: str = self._construct_catalog_url(seed_override)
+        self.catalog_url: str = self._construct_catalog_url(seed_override, os_override)
 
         self.available_apps:        dict = self._parse_catalog()
         self.available_apps_latest: dict = self._list_newest_installers_only()
 
 
-    def _construct_catalog_url(self, seed_type: SeedType) -> str:
+    def _construct_catalog_url(self, seed_type: SeedType, os_kernel: int) -> str:
         """
         Constructs the catalog URL based on the seed type
 
@@ -241,17 +252,30 @@ class RemoteInstallerCatalog:
             str: The catalog URL
         """
 
+        url: str = CATALOG_URL_BASE
 
-        url: str = ""
+        os_version: str = os_data.os_conversion.kernel_to_os(os_kernel)
+        os_version = "10.16" if os_version == "11" else os_version
+        if os_version not in CATALOG_URL_VARIANTS:
+            logging.error(f"OS version {os_version} is not supported, defaulting to latest")
+            os_version = CATALOG_URL_VARIANTS[0]
 
+        url += f"-{os_version}"
         if seed_type == SeedType.DeveloperSeed:
-            url = f"{CATALOG_URL_BASE}-{CATALOG_URL_VERSION}seed-{CATALOG_URL_EXTENSION}"
+            url += f"seed"
         elif seed_type == SeedType.PublicSeed:
-            url = f"{CATALOG_URL_BASE}-{CATALOG_URL_VERSION}beta-{CATALOG_URL_EXTENSION}"
+            url += f"beta"
         elif seed_type == SeedType.CustomerSeed:
-            url = f"{CATALOG_URL_BASE}-{CATALOG_URL_VERSION}customerseed-{CATALOG_URL_EXTENSION}"
-        else:
-            url = f"{CATALOG_URL_BASE}-{CATALOG_URL_EXTENSION}"
+            url += f"customerseed"
+
+        did_find_variant: bool = False
+        for variant in CATALOG_URL_VARIANTS:
+            if variant in url:
+                did_find_variant = True
+            if did_find_variant:
+                url += f"-{variant}"
+
+        url += f"{CATALOG_URL_EXTENSION}"
 
         return url
 
@@ -356,13 +380,10 @@ class RemoteInstallerCatalog:
                         continue
                     if "IntegrityDataURL" not in ia_package:
                         continue
-                    if "Size" not in ia_package:
-                        size = 0
 
                     download_link = ia_package["URL"]
                     integrity     = ia_package["IntegrityDataURL"]
-                    size          = ia_package["Size"]
-
+                    size          = ia_package["Size"] if ia_package["Size"] else 0
 
                 if any([version, build, download_link, size, integrity]) is None:
                     continue
@@ -376,6 +397,7 @@ class RemoteInstallerCatalog:
                         "integrity": integrity,
                         "Source":   "Apple Inc.",
                         "Variant":   catalog_url,
+                        "OS":        os_data.os_conversion.os_to_kernel(version)
                     }
                 })
 
@@ -457,7 +479,6 @@ class RemoteInstallerCatalog:
 
                     os_builds.append(newest_apps[ia]["Build"])
 
-        # Final passthrough
         # Remove Betas if there's a non-beta version available
         for ia in list(newest_apps):
             if newest_apps[ia]["Variant"] in ["CustomerSeed", "DeveloperSeed", "PublicSeed"]:
@@ -466,6 +487,11 @@ class RemoteInstallerCatalog:
                         newest_apps.pop(ia)
                         break
 
+        # Remove unsupported versions (namely 14)
+        for ia in list(newest_apps):
+            if newest_apps[ia]["Version"].split(".")[0] not in supported_versions:
+                newest_apps.pop(ia)
+
         return newest_apps
 
 
@@ -518,28 +544,34 @@ class LocalInstallerCatalog:
             if "CFBundleDisplayName" not in application_info_plist:
                 continue
 
-            app_version = application_info_plist["DTPlatformVersion"]
-            clean_name = application_info_plist["CFBundleDisplayName"]
+            app_version:  str = application_info_plist["DTPlatformVersion"]
+            clean_name:   str = application_info_plist["CFBundleDisplayName"]
+            app_sdk:      str = application_info_plist["DTSDKBuild"] if "DTSDKBuild" in application_info_plist else "Unknown"
+            min_required: str = application_info_plist["LSMinimumSystemVersion"] if "LSMinimumSystemVersion" in application_info_plist else "Unknown"
 
-            if "DTSDKBuild" in application_info_plist:
-                app_sdk = application_info_plist["DTSDKBuild"]
-            else:
-                app_sdk = "Unknown"
+            kernel:       int = 0
+            try:
+                kernel = int(app_sdk[:2])
+            except ValueError:
+                pass
+
+            min_required = os_data.os_conversion.os_to_kernel(min_required) if min_required != "Unknown" else 0
+
+            if min_required == os_data.os_data.sierra and kernel == os_data.os_data.ventura:
+                # Ventura's installer requires El Capitan minimum
+                # Ref: https://github.com/dortania/OpenCore-Legacy-Patcher/discussions/1038
+                min_required = os_data.os_data.el_capitan
 
             # app_version can sometimes report GM instead of the actual version
             # This is a workaround to get the actual version
             if app_version.startswith("GM"):
-                try:
-                    app_version = int(app_sdk[:2])
-                    if app_version < 20:
-                        app_version = f"10.{app_version - 4}"
-                    else:
-                        app_version = f"{app_version - 9}.0"
-                except ValueError:
+                if kernel == 0:
                     app_version = "Unknown"
+                else:
+                    app_version = os_data.os_conversion.kernel_to_os(kernel)
 
             # Check if App Version is High Sierra or newer
-            if os_data.os_conversion.os_to_kernel(app_version) < os_data.os_data.high_sierra:
+            if kernel < os_data.os_data.high_sierra:
                 continue
 
             results = self._parse_sharedsupport_version(Path(APPLICATION_SEARCH_PATH) / Path(application)/ Path("Contents/SharedSupport/SharedSupport.dmg"))
@@ -554,6 +586,8 @@ class LocalInstallerCatalog:
                     "Version": app_version,
                     "Build": app_sdk,
                     "Path": application,
+                    "Minimum Host OS": min_required,
+                    "OS": kernel
                 }
             })
 

resources/main.py

@@ -1,12 +1,13 @@
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
+import os
 import sys
 import time
 import logging
 import threading
 from pathlib import Path
 
-from resources.gui import gui_main
+from resources.wx_gui import gui_entry
 from resources import (
     constants,
     utilities,
@@ -16,7 +17,8 @@ from resources import (
     arguments,
     reroute_payloads,
     commit_info,
-    logging_handler
+    logging_handler,
+    analytics_handler,
 )
 
 
@@ -26,18 +28,14 @@ class OpenCoreLegacyPatcher:
     """
 
     def __init__(self) -> None:
-        logging_handler.InitializeLoggingSupport()
-
         self.constants: constants.Constants = constants.Constants()
 
-        self.constants.wxpython_variant: bool = True
-
-        logging.info(f"- Loading OpenCore Legacy Patcher v{self.constants.patcher_version}...")
+        logging_handler.InitializeLoggingSupport(self.constants)
 
         self._generate_base_data()
 
         if utilities.check_cli_args() is None:
-            gui_main.wx_python_gui(self.constants).main_menu(None)
+            gui_entry.EntryPoint(self.constants).start()
 
 
     def _generate_base_data(self) -> None:
@@ -45,6 +43,11 @@ class OpenCoreLegacyPatcher:
         Generate base data required for the patcher to run
         """
 
+        self.constants.wxpython_variant: bool = True
+
+        # Ensure we live after parent process dies (ie. LaunchAgent)
+        os.setpgrp()
+
         # Generate OS data
         os_data = os_probe.OSProbe()
         self.constants.detected_os = os_data.detect_kernel_major()
@@ -89,21 +92,18 @@ class OpenCoreLegacyPatcher:
 
         # Generate defaults
         defaults.GenerateDefaults(self.computer.real_model, True, self.constants)
+        threading.Thread(target=analytics_handler.Analytics(self.constants).send_analytics).start()
 
         if utilities.check_cli_args() is None:
-            logging.info(f"- No arguments present, loading {'GUI' if self.constants.wxpython_variant is True else 'TUI'} mode")
+            self.constants.cli_mode = False
             return
 
-        logging.info("- Detected arguments, switching to CLI mode")
+        logging.info("Detected arguments, switching to CLI mode")
         self.constants.gui_mode = True  # Assumes no user interaction is required
 
-        ignore_args = ["--auto_patch", "--gui_patch", "--gui_unpatch"]
+        ignore_args = ["--auto_patch", "--gui_patch", "--gui_unpatch", "--update_installed"]
         if not any(x in sys.argv for x in ignore_args):
             self.constants.current_path = Path.cwd()
-            self.constants.cli_mode = True
-            if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
-                logging.info("- Rerouting payloads location")
-                self.constants.payload_path = sys._MEIPASS / Path("payloads")
         ignore_args = ignore_args.pop(0)
 
         if not any(x in sys.argv for x in ignore_args):

resources/network_handler.py

@@ -9,6 +9,7 @@ import threading
 import logging
 import enum
 import hashlib
+import atexit
 from pathlib import Path
 
 from resources import utilities
@@ -109,6 +110,35 @@ class NetworkUtilities:
 
         return result
 
+    def post(self, url: str, **kwargs) -> requests.Response:
+        """
+        Wrapper for requests's post method
+        Implement additional error handling
+
+        Parameters:
+            url (str): URL to post
+            **kwargs: Additional parameters for requests.post
+
+        Returns:
+            requests.Response: Response object from requests.post
+        """
+
+        result: requests.Response = None
+
+        try:
+            result = SESSION.post(url, **kwargs)
+        except (
+            requests.exceptions.Timeout,
+            requests.exceptions.TooManyRedirects,
+            requests.exceptions.ConnectionError,
+            requests.exceptions.HTTPError
+        ) as error:
+            logging.warn(f"Error calling requests.post: {error}")
+            # Return empty response object
+            return requests.Response()
+
+        return result
+
 
 class DownloadObject:
     """
@@ -174,10 +204,10 @@ class DownloadObject:
 
         """
         self.status = DownloadStatus.DOWNLOADING
-        logging.info(f"- Starting download: {self.filename}")
+        logging.info(f"Starting download: {self.filename}")
         if spawn_thread:
             if self.active_thread:
-                logging.error("- Download already in progress")
+                logging.error("Download already in progress")
                 return
             self.should_checksum = verify_checksum
             self.active_thread = threading.Thread(target=self._download, args=(display_progress,))
@@ -237,8 +267,8 @@ class DownloadObject:
             else:
                 raise Exception("Content-Length missing from headers")
         except Exception as e:
-            logging.error(f"- Error determining file size {self.url}: {str(e)}")
-            logging.error("- Assuming file size is 0")
+            logging.error(f"Error determining file size {self.url}: {str(e)}")
+            logging.error("Assuming file size is 0")
             self.total_file_size = 0.0
 
 
@@ -265,17 +295,17 @@ class DownloadObject:
 
         try:
             if Path(path).exists():
-                logging.info(f"- Deleting existing file: {path}")
+                logging.info(f"Deleting existing file: {path}")
                 Path(path).unlink()
                 return True
 
             if not Path(path).parent.exists():
-                logging.info(f"- Creating directory: {Path(path).parent}")
+                logging.info(f"Creating directory: {Path(path).parent}")
                 Path(path).parent.mkdir(parents=True, exist_ok=True)
 
             available_space = utilities.get_free_space(Path(path).parent)
             if self.total_file_size > available_space:
-                msg = f"- Not enough free space to download {self.filename}, need {utilities.human_fmt(self.total_file_size)}, have {utilities.human_fmt(available_space)}"
+                msg = f"Not enough free space to download {self.filename}, need {utilities.human_fmt(self.total_file_size)}, have {utilities.human_fmt(available_space)}"
                 logging.error(msg)
                 raise Exception(msg)
 
@@ -283,9 +313,10 @@ class DownloadObject:
             self.error = True
             self.error_msg = str(e)
             self.status = DownloadStatus.ERROR
-            logging.error(f"- Error preparing working directory {path}: {self.error_msg}")
+            logging.error(f"Error preparing working directory {path}: {self.error_msg}")
             return False
 
+        logging.info(f"- Directory ready: {path}")
         return True
 
 
@@ -311,6 +342,7 @@ class DownloadObject:
             response = NetworkUtilities().get(self.url, stream=True, timeout=10)
 
             with open(self.filepath, 'wb') as file:
+                atexit.register(self.stop)
                 for i, chunk in enumerate(response.iter_content(1024 * 1024 * 4)):
                     if self.should_stop:
                         raise Exception("Download stopped")
@@ -322,21 +354,21 @@ class DownloadObject:
                         if display_progress and i % 100:
                             # Don't use logging here, as we'll be spamming the log file
                             if self.total_file_size == 0.0:
-                                print(f"- Downloaded {utilities.human_fmt(self.downloaded_file_size)} of {self.filename}")
+                                print(f"Downloaded {utilities.human_fmt(self.downloaded_file_size)} of {self.filename}")
                             else:
-                                print(f"- Downloaded {self.get_percent():.2f}% of {self.filename} ({utilities.human_fmt(self.get_speed())}/s) ({self.get_time_remaining():.2f} seconds remaining)")
+                                print(f"Downloaded {self.get_percent():.2f}% of {self.filename} ({utilities.human_fmt(self.get_speed())}/s) ({self.get_time_remaining():.2f} seconds remaining)")
                 self.download_complete = True
-                logging.info(f"- Download complete: {self.filename}")
-                logging.info("- Stats:")
-                logging.info(f"-   Downloaded size: {utilities.human_fmt(self.downloaded_file_size)}")
-                logging.info(f"-   Time elapsed: {(time.time() - self.start_time):.2f} seconds")
-                logging.info(f"-   Speed: {utilities.human_fmt(self.downloaded_file_size / (time.time() - self.start_time))}/s")
-                logging.info(f"-   Location: {self.filepath}")
+                logging.info(f"Download complete: {self.filename}")
+                logging.info("Stats:")
+                logging.info(f"- Downloaded size: {utilities.human_fmt(self.downloaded_file_size)}")
+                logging.info(f"- Time elapsed: {(time.time() - self.start_time):.2f} seconds")
+                logging.info(f"- Speed: {utilities.human_fmt(self.downloaded_file_size / (time.time() - self.start_time))}/s")
+                logging.info(f"- Location: {self.filepath}")
         except Exception as e:
             self.error = True
             self.error_msg = str(e)
             self.status = DownloadStatus.ERROR
-            logging.error(f"- Error downloading {self.url}: {self.error_msg}")
+            logging.error(f"Error downloading {self.url}: {self.error_msg}")
 
         self.status = DownloadStatus.COMPLETE
         utilities.enable_sleep_after_running()
@@ -351,7 +383,6 @@ class DownloadObject:
         """
 
         if self.total_file_size == 0.0:
-            logging.error("- File size is 0, cannot calculate percent")
             return -1
         return self.downloaded_file_size / self.total_file_size * 100
 
@@ -376,9 +407,11 @@ class DownloadObject:
         """
 
         if self.total_file_size == 0.0:
-            logging.error("- File size is 0, cannot calculate time remaining")
             return -1
-        return (self.total_file_size - self.downloaded_file_size) / self.get_speed()
+        speed = self.get_speed()
+        if speed <= 0:
+            return -1
+        return (self.total_file_size - self.downloaded_file_size) / speed
 
 
     def get_file_size(self) -> float:

resources/reroute_payloads.py

@@ -28,15 +28,15 @@ class RoutePayloadDiskImage:
         """
 
         if self.constants.wxpython_variant is True and not self.constants.launcher_script:
-            logging.info("- Running in Binary GUI mode, switching to tmp directory")
+            logging.info("Running in Binary GUI mode, switching to tmp directory")
             self.temp_dir = tempfile.TemporaryDirectory()
-            logging.info(f"- New payloads location: {self.temp_dir.name}")
-            logging.info("- Creating payloads directory")
+            logging.info(f"New payloads location: {self.temp_dir.name}")
+            logging.info("Creating payloads directory")
             Path(self.temp_dir.name / Path("payloads")).mkdir(parents=True, exist_ok=True)
             self._unmount_active_dmgs(unmount_all_active=False)
             output = subprocess.run(
                 [
-                    "hdiutil", "attach", "-noverify", f"{self.constants.payload_path}.dmg",
+                    "hdiutil", "attach", "-noverify", f"{self.constants.payload_path_dmg}",
                     "-mountpoint", Path(self.temp_dir.name / Path("payloads")),
                     "-nobrowse",
                     "-shadow", Path(self.temp_dir.name / Path("payloads_overlay")),
@@ -45,17 +45,17 @@ class RoutePayloadDiskImage:
                 stdout=subprocess.PIPE, stderr=subprocess.STDOUT
             )
             if output.returncode == 0:
-                logging.info("- Mounted payloads.dmg")
+                logging.info("Mounted payloads.dmg")
                 self.constants.current_path = Path(self.temp_dir.name)
                 self.constants.payload_path = Path(self.temp_dir.name) / Path("payloads")
                 atexit.register(self._unmount_active_dmgs, unmount_all_active=False)
             else:
-                logging.info("- Failed to mount payloads.dmg")
+                logging.info("Failed to mount payloads.dmg")
                 logging.info(f"Output: {output.stdout.decode()}")
                 logging.info(f"Return Code: {output.returncode}")
 
 
-    def _unmount_active_dmgs(self, unmount_all_active=True) -> None:
+    def _unmount_active_dmgs(self, unmount_all_active: bool = True) -> None:
         """
         Unmounts disk images associated with OCLP
 
@@ -70,20 +70,22 @@ class RoutePayloadDiskImage:
         dmg_info = subprocess.run(["hdiutil", "info", "-plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         dmg_info = plistlib.loads(dmg_info.stdout)
 
-        for image in dmg_info["images"]:
-            if image["image-path"].endswith("payloads.dmg"):
-                if unmount_all_active is False:
-                    # Check that only our personal payloads.dmg is unmounted
-                    if "shadow-path" in image:
-                        if self.temp_dir.name in image["shadow-path"]:
-                            logging.info("- Unmounting personal payloads.dmg")
-                            subprocess.run(
-                                ["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
-                                stdout=subprocess.PIPE, stderr=subprocess.STDOUT
-                            )
-                else:
-                    logging.info(f"- Unmounting payloads.dmg at: {image['system-entities'][0]['dev-entry']}")
-                    subprocess.run(
-                        ["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
-                        stdout=subprocess.PIPE, stderr=subprocess.STDOUT
-                    )
+
+        for variant in ["Universal-Binaries.dmg", "payloads.dmg"]:
+            for image in dmg_info["images"]:
+                if image["image-path"].endswith(variant):
+                    if unmount_all_active is False:
+                        # Check that only our personal payloads.dmg is unmounted
+                        if "shadow-path" in image:
+                            if self.temp_dir.name in image["shadow-path"]:
+                                logging.info(f"Unmounting personal {variant}")
+                                subprocess.run(
+                                    ["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
+                                    stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+                                )
+                    else:
+                        logging.info(f"Unmounting {variant} at: {image['system-entities'][0]['dev-entry']}")
+                        subprocess.run(
+                            ["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
+                            stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+                        )

resources/sys_patch/sys_patch.py

@@ -67,13 +67,6 @@ class PatchSysVolume:
 
         self.skip_root_kmutil_requirement = self.hardware_details["Settings: Supports Auxiliary Cache"]
 
-    def __del__(self) -> None:
-        """
-        Ensures that each time we're patching, we're using a clean PatcherSupportPkg folder
-        """
-
-        if Path(self.constants.payload_local_binaries_root_path).exists():
-            shutil.rmtree(self.constants.payload_local_binaries_root_path)
 
     def _init_pathing(self, custom_root_mount_path: Path = None, custom_data_mount_path: Path = None) -> None:
         """
@@ -287,8 +280,6 @@ class PatchSysVolume:
                 if self.needs_kmutil_exemptions is True:
                     logging.info("Note: Apple will require you to open System Preferences -> Security to allow the new kernel extensions to be loaded")
                 self.constants.root_patcher_succeeded = True
-                if self.constants.gui_mode is False:
-                    input("\nPress [ENTER] to continue")
 
 
     def _rebuild_kernel_collection(self) -> bool:
@@ -372,8 +363,6 @@ class PatchSysVolume:
             logging.info(result.stdout.decode())
             logging.info("")
             logging.info("\nPlease reboot the machine to avoid potential issues rerunning the patcher")
-            if self.constants.gui_mode is False:
-                input("Press [ENTER] to continue")
             return False
 
         if self.skip_root_kmutil_requirement is True:
@@ -385,8 +374,6 @@ class PatchSysVolume:
                 logging.info(result.stdout.decode())
                 logging.info("")
                 logging.info("\nPlease reboot the machine to avoid potential issues rerunning the patcher")
-                if self.constants.gui_mode is False:
-                    input("Press [ENTER] to continue")
                 return False
 
             for file in ["KextPolicy", "KextPolicy-shm", "KextPolicy-wal"]:
@@ -505,6 +492,8 @@ class PatchSysVolume:
         if Path(oclp_path).exists():
             oclp_plist_data = plistlib.load(Path(oclp_path).open("rb"))
             for key in oclp_plist_data:
+                if isinstance(oclp_plist_data[key], (bool, int)):
+                     continue
                 if "Install" not in oclp_plist_data[key]:
                     continue
                 for location in oclp_plist_data[key]["Install"]:
@@ -854,10 +843,27 @@ class PatchSysVolume:
             logging.info("- Local PatcherSupportPkg resources available, continuing...")
             return True
 
-        if Path(self.constants.payload_local_binaries_root_path_zip).exists():
-            logging.info("- Local PatcherSupportPkg resources available, unzipping...")
-            logging.info("- Unzipping binaries...")
-            utilities.process_status(subprocess.run(["ditto", "-V", "-x", "-k", "--sequesterRsrc", "--rsrc", self.constants.payload_local_binaries_root_path_zip, self.constants.payload_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+        if Path(self.constants.payload_local_binaries_root_path_dmg).exists():
+            logging.info("- Local PatcherSupportPkg resources available, mounting...")
+
+            output = subprocess.run(
+                [
+                    "hdiutil", "attach", "-noverify", f"{self.constants.payload_local_binaries_root_path_dmg}",
+                    "-mountpoint", Path(self.constants.payload_path / Path("Universal-Binaries")),
+                    "-nobrowse",
+                    "-shadow", Path(self.constants.payload_path / Path("Universal-Binaries_overlay")),
+                    "-passphrase", "password"
+                ],
+                stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+            )
+
+            if output.returncode != 0:
+                logging.info("- Failed to mount Universal-Binaries.dmg")
+                logging.info(f"Output: {output.stdout.decode()}")
+                logging.info(f"Return Code: {output.returncode}")
+                return False
+
+            logging.info("- Mounted Universal-Binaries.dmg")
             return True
 
         logging.info("- PatcherSupportPkg resources missing, Patcher likely corrupted!!!")
@@ -875,33 +881,18 @@ class PatchSysVolume:
         self.patch_set_dictionary = sys_patch_generate.GenerateRootPatchSets(self.computer.real_model, self.constants, self.hardware_details).patchset
 
         if self.patch_set_dictionary == {}:
-            change_menu = None
             logging.info("- No Root Patches required for your machine!")
-            if self.constants.gui_mode is False:
-                input("\nPress [ENTER] to return to the main menu: ")
-        elif self.constants.gui_mode is False:
-            change_menu = input("Would you like to continue with Root Volume Patching?(y/n): ")
-        else:
-            change_menu = "y"
-            logging.info("- Continuing root patching")
-        if change_menu in ["y", "Y"]:
-            logging.info("- Verifying whether Root Patching possible")
-            if sys_patch_detect.DetectRootPatch(self.computer.real_model, self.constants).verify_patch_allowed(print_errors=not self.constants.wxpython_variant) is True:
-                logging.info("- Patcher is capable of patching")
-                if self._check_files():
-                    if self._mount_root_vol() is True:
-                        self._patch_root_vol()
-                        if self.constants.gui_mode is False:
-                            input("\nPress [ENTER] to return to the main menu")
-                    else:
-                        logging.info("- Recommend rebooting the machine and trying to patch again")
-                        if self.constants.gui_mode is False:
-                            input("- Press [ENTER] to exit: ")
-            elif self.constants.gui_mode is False:
-                input("\nPress [ENTER] to return to the main menu: ")
+            return
+
+        logging.info("- Verifying whether Root Patching possible")
+        if sys_patch_detect.DetectRootPatch(self.computer.real_model, self.constants).verify_patch_allowed(print_errors=not self.constants.wxpython_variant) is True:
+            logging.info("- Patcher is capable of patching")
+            if self._check_files():
+                if self._mount_root_vol() is True:
+                    self._patch_root_vol()
+                else:
+                    logging.info("- Recommend rebooting the machine and trying to patch again")
 
-        else:
-            logging.info("- Returning to main menu")
 
     def start_unpatch(self) -> None:
         """
@@ -912,11 +903,5 @@ class PatchSysVolume:
         if sys_patch_detect.DetectRootPatch(self.computer.real_model, self.constants).verify_patch_allowed(print_errors=True) is True:
             if self._mount_root_vol() is True:
                 self._unpatch_root_vol()
-                if self.constants.gui_mode is False:
-                    input("\nPress [ENTER] to return to the main menu")
             else:
                 logging.info("- Recommend rebooting the machine and trying to patch again")
-                if self.constants.gui_mode is False:
-                    input("- Press [ENTER] to exit: ")
-        elif self.constants.gui_mode is False:
-            input("\nPress [ENTER] to return to the main menu")

resources/sys_patch/sys_patch_auto.py

@@ -1,14 +1,17 @@
 # Copyright (C) 2022, Mykola Grymalyuk
 
+import wx
+import logging
 import plistlib
 import subprocess
 import webbrowser
-import logging
+
 from pathlib import Path
 
+
 from resources import utilities, updates, global_settings, network_handler, constants
 from resources.sys_patch import sys_patch_detect
-from resources.gui import gui_main
+from resources.wx_gui import gui_entry
 
 
 class AutomaticSysPatch:
@@ -42,6 +45,28 @@ class AutomaticSysPatch:
             logging.info("- Auto Patch option is not supported on TUI, please use GUI")
             return
 
+        dict = updates.CheckBinaryUpdates(self.constants).check_binary_updates()
+        if dict:
+            for key in dict:
+                version = dict[key]["Version"]
+            logging.info(f"- Found new version: {version}")
+
+            app = wx.App()
+            frame = wx.Frame(None, -1, "OpenCore Legacy Patcher")
+            dialog = wx.MessageDialog(
+                parent=frame,
+                message=f"Current Version: {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}\nNew version: {version}\nWould you like to update?",
+                caption="Update Available for OpenCore Legacy Patcher!",
+                style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION
+            )
+            dialog.SetYesNoCancelLabels("Download and install", "View on Github", "Ignore")
+            response = dialog.ShowModal()
+            if response == wx.ID_YES:
+                gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.UPDATE_APP)
+            elif response == wx.ID_NO:
+                webbrowser.open(dict[key]["Github Link"])
+            return
+
         if utilities.check_seal() is True:
             logging.info("- Detected Snapshot seal intact, detecting patches")
             patches = sys_patch_detect.DetectRootPatch(self.constants.computer.real_model, self.constants).detect_patch_set()
@@ -58,69 +83,44 @@ class AutomaticSysPatch:
                 for patch in patches:
                     if patches[patch] is True and not patch.startswith("Settings") and not patch.startswith("Validation"):
                         patch_string += f"- {patch}\n"
-                # Check for updates
-                dict = updates.CheckBinaryUpdates(self.constants).check_binary_updates()
-                if not dict:
-                    logging.info("- No new binaries found on Github, proceeding with patching")
-                    if self.constants.launcher_script is None:
-                        args_string = f"'{self.constants.launcher_binary}' --gui_patch"
-                    else:
-                        args_string = f"{self.constants.launcher_binary} {self.constants.launcher_script} --gui_patch"
 
-                    warning_str = ""
-                    if network_handler.NetworkUtilities("https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest").verify_network_connection() is False:
-                        warning_str = f"""\n\nWARNING: We're unable to verify whether there are any new releases of OpenCore Legacy Patcher on Github. Be aware that you may be using an outdated version for this OS. If you're unsure, verify on Github that OpenCore Legacy Patcher {self.constants.patcher_version} is the latest official release"""
-
-                    args = [
-                        "osascript",
-                        "-e",
-                        f"""display dialog "OpenCore Legacy Patcher has detected you're running without Root Patches, and would like to install them.\n\nmacOS wipes all root patches during OS installs and updates, so they need to be reinstalled.\n\nFollowing Patches have been detected for your system: \n{patch_string}\nWould you like to apply these patches?{warning_str}" """
-                        f'with icon POSIX file "{self.constants.app_icon_path}"',
-                    ]
-                    output = subprocess.run(
-                        args,
-                        stdout=subprocess.PIPE,
-                        stderr=subprocess.STDOUT
-                    )
-                    if output.returncode == 0:
-                        args = [
-                            "osascript",
-                            "-e",
-                            f'''do shell script "{args_string}"'''
-                            f' with prompt "OpenCore Legacy Patcher would like to patch your root volume"'
-                            " with administrator privileges"
-                            " without altering line endings"
-                        ]
-                        subprocess.run(
-                            args,
-                            stdout=subprocess.PIPE,
-                            stderr=subprocess.STDOUT
-                        )
-                    return
+                logging.info("- No new binaries found on Github, proceeding with patching")
+                logging.info("- No new binaries found on Github, proceeding with patching")
+                if self.constants.launcher_script is None:
+                    args_string = f"'{self.constants.launcher_binary}' --gui_patch"
                 else:
-                    for key in dict:
-                        version = dict[key]["Version"]
-                        github_link = dict[key]["Github Link"]
-                    logging.info(f"- Found new version: {version}")
+                    args_string = f"{self.constants.launcher_binary} {self.constants.launcher_script} --gui_patch"
 
-                    # launch osascript to ask user if they want to apply the update
-                    # if yes, open the link in the default browser
-                    # we never want to run the root patcher if there are updates available
+                warning_str = ""
+                if network_handler.NetworkUtilities("https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest").verify_network_connection() is False:
+                    warning_str = f"""\n\nWARNING: We're unable to verify whether there are any new releases of OpenCore Legacy Patcher on Github. Be aware that you may be using an outdated version for this OS. If you're unsure, verify on Github that OpenCore Legacy Patcher {self.constants.patcher_version} is the latest official release"""
+
+                args = [
+                    "osascript",
+                    "-e",
+                    f"""display dialog "OpenCore Legacy Patcher has detected you're running without Root Patches, and would like to install them.\n\nmacOS wipes all root patches during OS installs and updates, so they need to be reinstalled.\n\nFollowing Patches have been detected for your system: \n{patch_string}\nWould you like to apply these patches?{warning_str}" """
+                    f'with icon POSIX file "{self.constants.app_icon_path}"',
+                ]
+                output = subprocess.run(
+                    args,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.STDOUT
+                )
+                if output.returncode == 0:
                     args = [
                         "osascript",
                         "-e",
-                        f"""display dialog "OpenCore Legacy Patcher has detected you're running without Root Patches, and would like to install them.\n\nHowever we've detected a new version of OCLP on Github. Would you like to view this?\n\nCurrent Version: {self.constants.patcher_version}\nLatest Version: {version}\n\nNote: After downloading the latest OCLP version, open the app and run the 'Post Install Root Patcher' from the main menu." """
-                        f'with icon POSIX file "{self.constants.app_icon_path}"',
+                        f'''do shell script "{args_string}"'''
+                        f' with prompt "OpenCore Legacy Patcher would like to patch your root volume"'
+                        " with administrator privileges"
+                        " without altering line endings"
                     ]
-                    output = subprocess.run(
+                    subprocess.run(
                         args,
                         stdout=subprocess.PIPE,
                         stderr=subprocess.STDOUT
                     )
-                    if output.returncode == 0:
-                        webbrowser.open(github_link)
-
-                    return
+                return
             else:
                 logging.info("- No patches detected")
         else:
@@ -170,7 +170,7 @@ class AutomaticSysPatch:
         if output.returncode == 0:
             logging.info("- Launching GUI's Build/Install menu")
             self.constants.start_build_install = True
-            gui_main.wx_python_gui(self.constants).main_menu(None)
+            gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.BUILD_OC)
 
         return False
 
@@ -245,7 +245,7 @@ class AutomaticSysPatch:
             if output.returncode == 0:
                 logging.info("- Launching GUI's Build/Install menu")
                 self.constants.start_build_install = True
-                gui_main.wx_python_gui(self.constants).main_menu(None)
+                gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.BUILD_OC)
 
         except KeyError:
             logging.info("- Unable to determine if boot disk is removable, skipping prompt")
@@ -312,9 +312,75 @@ class AutomaticSysPatch:
         utilities.process_status(utilities.elevated(["chmod", "644", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
         utilities.process_status(utilities.elevated(["chown", "root:wheel", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
 
+        # Copy over our launch daemon
+        if self._create_rsr_monitor_daemon() is True:
+            logging.info("- Copying rsr-monitor.plist Launch Daemon to /Library/LaunchDaemons/")
+            if Path("/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist").exists():
+                logging.info("- Deleting existing rsr-monitor.plist")
+                utilities.process_status(utilities.elevated(["rm", "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            if not Path("/Library/LaunchDaemons/").exists():
+                logging.info("- Creating /Library/LaunchDaemons/")
+                utilities.process_status(utilities.elevated(["mkdir", "-p", "/Library/LaunchDaemons/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["cp", self.constants.rsr_monitor_launch_daemon_path, "/Library/LaunchDaemons/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
+            # Set the permissions on the com.dortania.opencore-legacy-patcher.rsr-monitor.plist
+            logging.info("- Setting permissions on rsr-monitor.plist")
+            utilities.process_status(utilities.elevated(["chmod", "644", "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["chown", "root:wheel", "/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.rsr-monitor.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
         # Making app alias
         # Simply an easy way for users to notice the app
         # If there's already an alias or exiting app, skip
         if not Path("/Applications/OpenCore-Patcher.app").exists():
             logging.info("- Making app alias")
-            utilities.process_status(utilities.elevated(["ln", "-s", "/Library/Application Support/Dortania/OpenCore-Patcher.app", "/Applications/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["ln", "-s", "/Library/Application Support/Dortania/OpenCore-Patcher.app", "/Applications/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
+
+    def _create_rsr_monitor_daemon(self) -> bool:
+        # Get kext list in /Library/Extensions that have the 'GPUCompanionBundles' property
+        # This is used to determine if we need to run the RSRMonitor
+        logging.info("- Checking if RSRMonitor is needed")
+
+        cryptex_path = f"/System/Volumes/Preboot/{utilities.get_preboot_uuid()}/cryptex1/current/OS.dmg"
+        if not Path(cryptex_path).exists():
+            logging.info("- No OS.dmg, skipping RSRMonitor")
+            return False
+
+        kexts = []
+        for kext in Path("/Library/Extensions").glob("*.kext"):
+            if not Path(f"{kext}/Contents/Info.plist").exists():
+                continue
+            try:
+                kext_plist = plistlib.load(open(f"{kext}/Contents/Info.plist", "rb"))
+            except Exception as e:
+                logging.info(f"  - Failed to load plist for {kext.name}: {e}")
+                continue
+            if "GPUCompanionBundles" not in kext_plist:
+                continue
+            logging.info(f"  - Found kext with GPUCompanionBundles: {kext.name}")
+            kexts.append(kext.name)
+
+        # If we have no kexts, we don't need to run the RSRMonitor
+        if not kexts:
+            logging.info("- No kexts found with GPUCompanionBundles, skipping RSRMonitor")
+            return False
+
+        # Load the RSRMonitor plist
+        rsr_monitor_plist = plistlib.load(open(self.constants.rsr_monitor_launch_daemon_path, "rb"))
+
+        arguments = ["rm", "-Rfv"]
+        arguments += [f"/Library/Extensions/{kext}" for kext in kexts]
+
+        # Add the arguments to the RSRMonitor plist
+        rsr_monitor_plist["ProgramArguments"] = arguments
+
+        # Next add monitoring for '/System/Volumes/Preboot/{UUID}/cryptex1/OS.dmg'
+        logging.info(f"  - Adding monitor: {cryptex_path}")
+        rsr_monitor_plist["WatchPaths"] = [
+            cryptex_path,
+        ]
+
+        # Write the RSRMonitor plist
+        plistlib.dump(rsr_monitor_plist, Path(self.constants.rsr_monitor_launch_daemon_path).open("wb"))
+
+        return True

resources/sys_patch/sys_patch_detect.py

@@ -92,7 +92,7 @@ class DetectRootPatch:
         non_metal_os = os_data.os_data.catalina
         for i, gpu in enumerate(gpus):
             if gpu.class_code and gpu.class_code != 0xFFFFFFFF:
-                logging.info(f"- Found GPU ({i}): {utilities.friendly_hex(gpu.vendor_id)}:{utilities.friendly_hex(gpu.device_id)}")
+                logging.info(f"Found GPU ({i}): {utilities.friendly_hex(gpu.vendor_id)}:{utilities.friendly_hex(gpu.device_id)}")
                 if gpu.arch in [device_probe.NVIDIA.Archs.Tesla] and self.constants.force_nv_web is False:
                     if self.constants.detected_os > non_metal_os:
                         self.nvidia_tesla = True
@@ -477,12 +477,6 @@ class DetectRootPatch:
         if self.constants.detected_os < os_data.os_data.ventura:
             return False
 
-        for controller in self.constants.computer.usb_controllers:
-            if (isinstance(controller, device_probe.XHCIController)):
-                # Currently USB 1.1 patches are incompatible with USB 3.0 controllers
-                # TODO: Downgrade remaining USB stack to ensure full support
-                return False
-
         # If we're on a hackintosh, check for UHCI/OHCI controllers
         if self.constants.host_is_hackintosh is True:
             for controller in self.constants.computer.usb_controllers:
@@ -585,6 +579,7 @@ class DetectRootPatch:
             "Settings: Kernel Debug Kit missing":          self.missing_kdk if self.constants.detected_os >= os_data.os_data.ventura.value else False,
             "Validation: Patching Possible":               self.verify_patch_allowed(),
             "Validation: Unpatching Possible":             self._verify_unpatch_allowed(),
+            f"Validation: Unsupported Host OS":            True if self.constants.detected_os > os_data.os_data.ventura and not Path("~/.dortania_developer").expanduser().exists() else False,
             f"Validation: SIP is enabled (Required: {self._check_sip()[2]} or higher)":  self.sip_enabled,
             f"Validation: Currently Booted SIP: ({hex(py_sip_xnu.SipXnu().get_sip_status().value)})":         self.sip_enabled,
             "Validation: SecureBootModel is enabled":      self.sbm_enabled,

resources/sys_patch/sys_patch_generate.py

@@ -40,7 +40,7 @@ class GenerateRootPatchSets:
 
         utilities.cls()
 
-        logging.info("- The following patches will be applied:")
+        logging.info("The following patches will be applied:")
 
         if self.hardware_details["Graphics: Intel Ironlake"] is True:
             required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]})
@@ -52,8 +52,8 @@ class GenerateRootPatchSets:
             required_patches.update({"High Sierra GVA": all_hardware_patchset["Graphics"]["High Sierra GVA"]})
             required_patches.update({"WebKit Monterey Common": all_hardware_patchset["Graphics"]["WebKit Monterey Common"]})
             required_patches.update({"Intel Sandy Bridge": all_hardware_patchset["Graphics"]["Intel Sandy Bridge"]})
-            # Patchset breaks Display Profiles, don't install if primary GPU is AMD
-            if self.constants.computer.real_model not in ["Macmini5,2", "iMac12,1", "iMac12,2"]:
+            # Patchset breaks Display Profiles, don't install if primary GPU is AMD. Give users option to disable patch in settings to restore Display Profiles
+            if self.constants.computer.real_model not in ["Macmini5,2", "iMac12,1", "iMac12,2"] or self.constants.disable_cat_colorsync is False:
                 required_patches.update({"Non-Metal ColorSync Workaround": all_hardware_patchset["Graphics"]["Non-Metal ColorSync Workaround"]})
 
         if self.hardware_details["Graphics: Intel Ivy Bridge"] is True:
@@ -184,8 +184,8 @@ class GenerateRootPatchSets:
                     del(required_patches[patch_name])
                 else:
                     if required_patches[patch_name]["Display Name"]:
-                        logging.info(f"  - {required_patches[patch_name]['Display Name']}")
+                        logging.info(f"- {required_patches[patch_name]['Display Name']}")
         else:
-            logging.info("  - No patch sets found for booted model")
+            logging.info("- No patch sets found for booted model")
 
         return required_patches

resources/sys_patch/sys_patch_helpers.py

@@ -5,6 +5,8 @@ import plistlib
 import os
 import logging
 import subprocess
+
+from typing import Union
 from pathlib import Path
 from datetime import datetime
 
@@ -40,10 +42,10 @@ class SysPatchHelpers:
         if self.constants.computer.reported_board_id in self.constants.sandy_board_id_stock:
             return
 
-        logging.info(f"- Found unsupported Board ID {self.constants.computer.reported_board_id}, performing AppleIntelSNBGraphicsFB bin patching")
+        logging.info(f"Found unsupported Board ID {self.constants.computer.reported_board_id}, performing AppleIntelSNBGraphicsFB bin patching")
 
         board_to_patch = generate_smbios.determine_best_board_id_for_sandy(self.constants.computer.reported_board_id, self.constants.computer.gpus)
-        logging.info(f"- Replacing {board_to_patch} with {self.constants.computer.reported_board_id}")
+        logging.info(f"Replacing {board_to_patch} with {self.constants.computer.reported_board_id}")
 
         board_to_patch_hex = bytes.fromhex(board_to_patch.encode('utf-8').hex())
         reported_board_hex = bytes.fromhex(self.constants.computer.reported_board_id.encode('utf-8').hex())
@@ -52,12 +54,12 @@ class SysPatchHelpers:
             # Pad the reported Board ID with zeros to match the length of the board to patch
             reported_board_hex = reported_board_hex + bytes(len(board_to_patch_hex) - len(reported_board_hex))
         elif len(board_to_patch_hex) < len(reported_board_hex):
-            logging.info(f"- Error: Board ID {self.constants.computer.reported_board_id} is longer than {board_to_patch}")
+            logging.info(f"Error: Board ID {self.constants.computer.reported_board_id} is longer than {board_to_patch}")
             raise Exception("Host's Board ID is longer than the kext's Board ID, cannot patch!!!")
 
         path = source_files_path + "/10.13.6/System/Library/Extensions/AppleIntelSNBGraphicsFB.kext/Contents/MacOS/AppleIntelSNBGraphicsFB"
         if not Path(path).exists():
-            logging.info(f"- Error: Could not find {path}")
+            logging.info(f"Error: Could not find {path}")
             raise Exception("Failed to find AppleIntelSNBGraphicsFB.kext, cannot patch!!!")
 
         with open(path, 'rb') as f:
@@ -95,6 +97,7 @@ class SysPatchHelpers:
             "Commit URL": f"{self.constants.commit_info[2]}",
             "Kernel Debug Kit Used": f"{kdk_string}",
             "OS Version": f"{self.constants.detected_os}.{self.constants.detected_os_minor} ({self.constants.detected_os_build})",
+            "Custom Signature": bool(Path(self.constants.payload_local_binaries_root_path / ".signed").exists()),
         }
 
         data.update(patchset)
@@ -125,7 +128,7 @@ class SysPatchHelpers:
         if self.constants.detected_os < os_data.os_data.ventura:
              return
 
-        logging.info("- Disabling WindowServer Caching")
+        logging.info("Disabling WindowServer Caching")
         # Invoke via 'bash -c' to resolve pathing
         utilities.elevated(["bash", "-c", "rm -rf /private/var/folders/*/*/*/WindowServer/com.apple.WindowServer"])
         # Disable writing to WindowServer folder
@@ -147,12 +150,12 @@ class SysPatchHelpers:
         if self.constants.detected_os < os_data.os_data.ventura:
             return
 
-        logging.info("- Parsing Notification Centre Widgets")
+        logging.info("Parsing Notification Centre Widgets")
         file_path = "~/Library/Containers/com.apple.notificationcenterui/Data/Library/Preferences/com.apple.notificationcenterui.plist"
         file_path = Path(file_path).expanduser()
 
         if not file_path.exists():
-            logging.info("  - Defaults file not found, skipping")
+            logging.info("- Defaults file not found, skipping")
             return
 
         did_find = False
@@ -175,7 +178,7 @@ class SysPatchHelpers:
                             continue
                         if not b'com.apple.news' in sub_data[sub_entry][2]:
                             continue
-                        logging.info(f"  - Found News Widget to remove: {sub_data[sub_entry][2].decode('ascii')}")
+                        logging.info(f"- Found News Widget to remove: {sub_data[sub_entry][2].decode('ascii')}")
                         data["widgets"]["instances"].remove(widget)
                         did_find = True
 
@@ -207,13 +210,13 @@ class SysPatchHelpers:
         if self.constants.detected_os < os_data.os_data.big_sur:
             return
 
-        logging.info("- Installing Kernel Collection syncing utility")
+        logging.info("Installing Kernel Collection syncing utility")
         result = utilities.elevated([self.constants.rsrrepair_userspace_path, "--install"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         if result.returncode != 0:
-            logging.info(f"  - Failed to install RSRRepair: {result.stdout.decode()}")
+            logging.info(f"- Failed to install RSRRepair: {result.stdout.decode()}")
 
 
-    def patch_gpu_compiler_libraries(self, mount_point: str | Path):
+    def patch_gpu_compiler_libraries(self, mount_point: Union[str, Path]):
         """
         Fix GPUCompiler.framework's libraries to resolve linking issues
 
@@ -259,16 +262,9 @@ class SysPatchHelpers:
             if not file.name.startswith("31001."):
                 continue
 
-            logging.info(f"- Merging GPUCompiler.framework libraries to match binary")
+            logging.info(f"Merging GPUCompiler.framework libraries to match binary")
 
             src_dir = f"{LIBRARY_DIR}/{file.name}"
-            for file in ["module.modulemap", "opencl-c.h"]:
-                # Copy on Write to reduce disk usage
-                dst_path = f"{DEST_DIR}/include/{file}"
-                if Path(dst_path).exists():
-                    continue
-                utilities.process_status(utilities.elevated(["cp", "-c", f"{src_dir}/include/{file}", f"{DEST_DIR}/include/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-
             if not Path(f"{DEST_DIR}/lib").exists():
                 utilities.process_status(utilities.elevated(["cp", "-cR", f"{src_dir}/lib", f"{DEST_DIR}/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
 

resources/updates.py

@@ -2,7 +2,6 @@
 # Check whether new updates are available for OpenCore Legacy Patcher binary
 # Call check_binary_updates() to determine if any updates are available
 # Returns dict with Link and Version of the latest binary update if available
-import requests
 import logging
 
 from resources import network_handler, constants
@@ -35,6 +34,12 @@ class CheckBinaryUpdates:
         if local_version is None:
             local_version = self.binary_version_array
 
+
+        if local_version == remote_version:
+            if not self.constants.commit_info[0].startswith("refs/tags"):
+                # Check for nightly builds
+                return True
+
         # Pad version numbers to match length (ie. 0.1.0 vs 0.1.0.1)
         while len(remote_version) > len(local_version):
             local_version.append(0)
@@ -99,6 +104,9 @@ class CheckBinaryUpdates:
         response = network_handler.NetworkUtilities().get(REPO_LATEST_RELEASE_URL)
         data_set = response.json()
 
+        if "tag_name" not in data_set:
+            return None
+
         self.remote_version = data_set["tag_name"]
 
         self.remote_version_array = self.remote_version.split(".")
@@ -108,7 +116,7 @@ class CheckBinaryUpdates:
             return None
 
         for asset in data_set["assets"]:
-            logging.info(f"- Found asset: {asset['name']}")
+            logging.info(f"Found asset: {asset['name']}")
             if self._determine_remote_type(asset["name"]) == self._determine_local_build_type():
                 available_binaries.update({
                     asset['name']: {

resources/utilities.py

@@ -48,6 +48,44 @@ def human_fmt(num):
     return "%.1f %s" % (num, "EB")
 
 
+def seconds_to_readable_time(seconds) -> str:
+    """
+    Convert seconds to a readable time format
+
+    Parameters:
+        seconds (int | float | str): Seconds to convert
+
+    Returns:
+        str: Readable time format
+    """
+    seconds = int(seconds)
+    time = ""
+
+    if seconds == 0:
+        return "Almost done"
+    if seconds < 0:
+        return "Indeterminate"
+
+    years, seconds = divmod(seconds, 31536000)
+    days, seconds = divmod(seconds, 86400)
+    hours, seconds = divmod(seconds, 3600)
+    minutes, seconds = divmod(seconds, 60)
+
+    if years > 0:
+        return "Over a year"
+    if days > 0:
+        if days > 31:
+            return "Over a month"
+        time += f"{days}d "
+    if hours > 0:
+        time += f"{hours}h "
+    if minutes > 0:
+        time += f"{minutes}m "
+    if seconds > 0:
+        time += f"{seconds}s"
+    return time
+
+
 def header(lines):
     lines = [i for i in lines if i is not None]
     total_length = len(max(lines, key=len)) + 4
@@ -120,7 +158,7 @@ sleep_process = None
 
 def disable_sleep_while_running():
     global sleep_process
-    logging.info("- Disabling Idle Sleep")
+    logging.info("Disabling Idle Sleep")
     if sleep_process is None:
         # If sleep_process is active, we'll just keep it running
         sleep_process = subprocess.Popen(["caffeinate", "-d", "-i", "-s"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -130,7 +168,7 @@ def disable_sleep_while_running():
 def enable_sleep_after_running():
     global sleep_process
     if sleep_process:
-        logging.info("- Re-enabling Idle Sleep")
+        logging.info("Re-enabling Idle Sleep")
         sleep_process.kill()
         sleep_process = None
 
@@ -356,9 +394,6 @@ def get_firmware_vendor(*, decode: bool = False):
             value = value.strip("\0")
     return value
 
-def dump_constants(constants):
-    with open(os.path.join(os.path.expanduser('~'), 'Desktop', 'internal_data.txt'), 'w') as f:
-        f.write(str(vars(constants)))
 
 def find_apfs_physical_volume(device):
     # ex: disk3s1s1
@@ -451,6 +486,15 @@ def monitor_disk_output(disk):
     return output
 
 
+def get_preboot_uuid() -> str:
+    """
+    Get the UUID of the Preboot volume
+    """
+    args = ["ioreg", "-a", "-n", "chosen", "-p", "IODeviceTree", "-r"]
+    output = plistlib.loads(subprocess.run(args, stdout=subprocess.PIPE).stdout)
+    return output[0]["apfs-preboot-uuid"].strip(b"\0").decode()
+
+
 def block_os_updaters():
     # Disables any processes that would be likely to mess with
     # the root volume while we're working with it.
@@ -469,7 +513,7 @@ def block_os_updaters():
         for bad_process in bad_processes:
             if bad_process in current_process:
                 if pid != "":
-                    logging.info(f"- Killing Process: {pid} - {current_process.split('/')[-1]}")
+                    logging.info(f"Killing Process: {pid} - {current_process.split('/')[-1]}")
                     subprocess.run(["kill", "-9", pid])
                     break
 
@@ -525,6 +569,7 @@ def check_cli_args():
     parser.add_argument("--gui_patch", help="Starts GUI in Root Patcher", action="store_true", required=False)
     parser.add_argument("--gui_unpatch", help="Starts GUI in Root Unpatcher", action="store_true", required=False)
     parser.add_argument("--auto_patch", help="Check if patches are needed and prompt user", action="store_true", required=False)
+    parser.add_argument("--update_installed", help="Prompt user to finish updating via GUI", action="store_true", required=False)
 
     args = parser.parse_args()
     if not (args.build or args.patch_sys_vol or args.unpatch_sys_vol or args.validate or args.auto_patch):

resources/validation.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 from resources.sys_patch import sys_patch_helpers
 from resources.build import build
-from resources import constants
+from resources import constants, network_handler
 from data import example_data, model_array, sys_patch_dict, os_data
 
 
@@ -120,7 +120,7 @@ class PatcherValidation:
                                     logging.info(f"File not found: {source_file}")
                                     raise Exception(f"Failed to find {source_file}")
 
-        logging.info(f"- Validating against Darwin {major_kernel}.{minor_kernel}")
+        logging.info(f"Validating against Darwin {major_kernel}.{minor_kernel}")
         if not sys_patch_helpers.SysPatchHelpers(self.constants).generate_patchset_plist(patchset, f"OpenCore-Legacy-Patcher-{major_kernel}.{minor_kernel}.plist", None):
             raise Exception("Failed to generate patchset plist")
 
@@ -133,35 +133,64 @@ class PatcherValidation:
         Validates sys_patch modules
         """
 
-        if Path(self.constants.payload_local_binaries_root_path_zip).exists():
-            logging.info("Validating Root Patch File integrity")
-            if not Path(self.constants.payload_local_binaries_root_path).exists():
-                subprocess.run(
-                    [
-                        "ditto", "-V", "-x", "-k", "--sequesterRsrc", "--rsrc",
-                        self.constants.payload_local_binaries_root_path_zip,
-                        self.constants.payload_path
-                    ],
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT
-                )
-            for supported_os in [os_data.os_data.big_sur, os_data.os_data.monterey, os_data.os_data.ventura]:
-                for i in range(0, 10):
-                    self._validate_root_patch_files(supported_os, i)
-            logging.info("Validating SNB Board ID patcher")
-            self.constants.computer.reported_board_id = "Mac-7BA5B2DFE22DDD8C"
-            sys_patch_helpers.SysPatchHelpers(self.constants).snb_board_id_patch(self.constants.payload_local_binaries_root_path)
+        if not Path(self.constants.payload_local_binaries_root_path_dmg).exists():
+            dl_obj = network_handler.DownloadObject(f"https://github.com/dortania/PatcherSupportPkg/releases/download/{self.constants.patcher_support_pkg_version}/Universal-Binaries.dmg", self.constants.payload_local_binaries_root_path_dmg)
+            dl_obj.download(spawn_thread=False)
+            if dl_obj.download_complete is False:
+                logging.info("Failed to download Universal-Binaries.dmg")
+                raise Exception("Failed to download Universal-Binaries.dmg")
 
-            # Clean up
-            subprocess.run(
-                [
-                    "rm", "-rf", self.constants.payload_local_binaries_root_path
-                ],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT
-            )
-        else:
-            logging.info("- Skipping Root Patch File integrity validation")
+        logging.info("Validating Root Patch File integrity")
+        output = subprocess.run(
+            [
+                "hdiutil", "attach", "-noverify", f"{self.constants.payload_local_binaries_root_path_dmg}",
+                "-mountpoint", Path(self.constants.payload_path / Path("Universal-Binaries")),
+                "-nobrowse",
+                "-shadow", Path(self.constants.payload_path / Path("Universal-Binaries_overlay")),
+                "-passphrase", "password"
+            ],
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+        )
+
+        if output.returncode != 0:
+            logging.info("Failed to mount Universal-Binaries.dmg")
+            logging.info(f"Output: {output.stdout.decode()}")
+            logging.info(f"Return Code: {output.returncode}")
+
+            raise Exception("Failed to mount Universal-Binaries.dmg")
+
+        logging.info("Mounted Universal-Binaries.dmg")
+
+
+        for supported_os in [os_data.os_data.big_sur, os_data.os_data.monterey, os_data.os_data.ventura]:
+            for i in range(0, 10):
+                self._validate_root_patch_files(supported_os, i)
+        logging.info("Validating SNB Board ID patcher")
+        self.constants.computer.reported_board_id = "Mac-7BA5B2DFE22DDD8C"
+        sys_patch_helpers.SysPatchHelpers(self.constants).snb_board_id_patch(self.constants.payload_local_binaries_root_path)
+
+        # unmount the dmg
+        output = subprocess.run(
+            [
+                "hdiutil", "detach", Path(self.constants.payload_path / Path("Universal-Binaries")),
+                "-force"
+            ],
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+        )
+
+        if output.returncode != 0:
+            logging.info("Failed to unmount Universal-Binaries.dmg")
+            logging.info(f"Output: {output.stdout.decode()}")
+            logging.info(f"Return Code: {output.returncode}")
+
+            raise Exception("Failed to unmount Universal-Binaries.dmg")
+
+        subprocess.run(
+            [
+                "rm", "-f", Path(self.constants.payload_path / Path("Universal-Binaries_overlay"))
+            ],
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+        )
 
 
     def _validate_configs(self) -> None:

resources/wx_gui/gui_about.py

@@ -0,0 +1,67 @@
+# About frame, just to sat
+
+import wx
+import wx.adv
+import logging
+
+from resources.wx_gui import gui_support
+
+from resources import constants
+
+
+class AboutFrame(wx.Frame):
+
+    def __init__(self, global_constants: constants.Constants) -> None:
+        if wx.FindWindowByName("About"):
+            return
+
+        logging.info("Generating About frame")
+        super(AboutFrame, self).__init__(None, title="About", size=(350, 350), style=wx.DEFAULT_FRAME_STYLE & ~(wx.RESIZE_BORDER | wx.MAXIMIZE_BOX))
+        self.constants: constants.Constants = global_constants
+        self.Centre()
+        self.hyperlink_colour = (25, 179, 231)
+
+        self._generate_elements(self)
+
+        self.Show()
+
+
+    def _generate_elements(self, frame: wx.Frame) -> None:
+
+        # Set title
+        title = wx.StaticText(frame, label="OpenCore Legacy Patcher", pos=(-1, 5))
+        title.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont"))
+        title.Centre(wx.HORIZONTAL)
+
+        # Set version
+        version = wx.StaticText(frame, label=f"Version: {self.constants.patcher_version}", pos=(-1, title.GetPosition()[1] + title.GetSize()[1] + 5))
+        version.SetFont(wx.Font(11, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
+        version.Centre(wx.HORIZONTAL)
+
+        # Description
+        description = [
+            "Written by a small group of Mac hobbyists who just",
+            "want to keep old machines out of the landfill!",
+
+        ]
+        spacer = 5
+        for line in description:
+            desc = wx.StaticText(frame, label=line, pos=(-1, version.GetPosition()[1] + version.GetSize()[1] + 5 + spacer))
+            desc.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
+            desc.Centre(wx.HORIZONTAL)
+
+            spacer += 20
+
+        # Set icon
+        icon_mac = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/com.apple.macbook-unibody-plastic.icns"
+        icon_mac = wx.StaticBitmap(frame, bitmap=wx.Bitmap(icon_mac, wx.BITMAP_TYPE_ICON), pos=(5, desc.GetPosition()[1] - 15))
+        icon_mac.SetSize((160, 160))
+        icon_mac.Centre(wx.HORIZONTAL)
+
+        icon_path = str(self.constants.app_icon_path)
+        icon = wx.StaticBitmap(frame, bitmap=wx.Bitmap(icon_path, wx.BITMAP_TYPE_ICON), pos=(5, desc.GetPosition()[1] + desc.GetSize()[1] + 17))
+        icon.SetSize((64, 64))
+        icon.Centre(wx.HORIZONTAL)
+
+        # Set frame size
+        frame.SetSize((-1, icon.GetPosition()[1] + icon.GetSize()[1] + 60))

resources/wx_gui/gui_build.py

@@ -0,0 +1,160 @@
+# Generate UI for Building OpenCore
+import wx
+import logging
+import threading
+import traceback
+
+from resources import constants
+from resources.build import build
+from resources.wx_gui import (
+    gui_main_menu,
+    gui_install_oc,
+    gui_support
+)
+
+
+class BuildFrame(wx.Frame):
+    """
+    Create a frame for building OpenCore
+    Uses a Modal Dialog for smoother transition from other frames
+    """
+    def __init__(self, parent: wx.Frame, title: str, global_constants: constants.Constants, screen_location: tuple = None) -> None:
+        logging.info("Initializing Build Frame")
+        super(BuildFrame, self).__init__(parent, title=title, size=(350, 200), style=wx.DEFAULT_FRAME_STYLE & ~(wx.RESIZE_BORDER | wx.MAXIMIZE_BOX))
+        gui_support.GenerateMenubar(self, global_constants).generate()
+
+        self.install_button: wx.Button = None
+        self.text_box:     wx.TextCtrl = None
+        self.frame_modal:    wx.Dialog = None
+
+        self.constants: constants.Constants = global_constants
+        self.title: str = title
+        self.stock_output = logging.getLogger().handlers[0].stream
+
+        self.frame_modal = wx.Dialog(self, title=title, size=(400, 200))
+
+        self._generate_elements(self.frame_modal)
+
+        if self.constants.update_stage != gui_support.AutoUpdateStages.INACTIVE:
+            self.constants.update_stage = gui_support.AutoUpdateStages.BUILDING
+
+        self.Centre()
+        self.frame_modal.ShowWindowModal()
+
+        self._invoke_build()
+
+
+    def _generate_elements(self, frame: wx.Frame = None) -> None:
+        """
+        Generate UI elements for build frame
+
+        Format:
+            - Title label:        Build and Install OpenCore
+            - Text:               Model: {Build or Host Model}
+            - Button:             Install OpenCore
+            - Read-only text box: {empty}
+            - Button:             Return to Main Menu
+        """
+        frame = self if not frame else frame
+
+        title_label = wx.StaticText(frame, label="Build and Install OpenCore", pos=(-1,5))
+        title_label.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont"))
+        title_label.Centre(wx.HORIZONTAL)
+
+        model_label = wx.StaticText(frame, label=f"Model: {self.constants.custom_model or self.constants.computer.real_model}", pos=(-1,30))
+        model_label.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
+        model_label.Centre(wx.HORIZONTAL)
+
+        # Button: Install OpenCore
+        install_button = wx.Button(frame, label="🔩 Install OpenCore", pos=(-1, model_label.GetPosition()[1] + model_label.GetSize()[1]), size=(150, 30))
+        install_button.Bind(wx.EVT_BUTTON, self.on_install)
+        install_button.Centre(wx.HORIZONTAL)
+        install_button.Disable()
+        self.install_button = install_button
+
+        # Read-only text box: {empty}
+        text_box = wx.TextCtrl(frame, value="", pos=(-1, install_button.GetPosition()[1] + install_button.GetSize()[1] + 10), size=(400, 350), style=wx.TE_READONLY | wx.TE_MULTILINE | wx.TE_RICH2)
+        text_box.Centre(wx.HORIZONTAL)
+        self.text_box = text_box
+
+        # Button: Return to Main Menu
+        return_button = wx.Button(frame, label="Return to Main Menu", pos=(-1, text_box.GetPosition()[1] + text_box.GetSize()[1] + 5), size=(200, 30))
+        return_button.Bind(wx.EVT_BUTTON, self.on_return_to_main_menu)
+        return_button.Centre(wx.HORIZONTAL)
+        return_button.Disable()
+        self.return_button = return_button
+
+        # Adjust window size to fit all elements
+        frame.SetSize((-1, return_button.GetPosition()[1] + return_button.GetSize()[1] + 40))
+
+
+    def _invoke_build(self) -> None:
+        """
+        Invokes build function and waits for it to finish
+        """
+        while gui_support.PayloadMount(self.constants, self).is_unpack_finished() is False:
+            wx.Yield()
+
+        thread = threading.Thread(target=self._build)
+        thread.start()
+
+        while thread.is_alive():
+            wx.Yield()
+
+        self.return_button.Enable()
+        dialog = wx.MessageDialog(
+            parent=self,
+            message=f"Would you like to install OpenCore now?",
+            caption="Finished building your OpenCore configuration!",
+            style=wx.YES_NO | wx.ICON_QUESTION
+        )
+        dialog.SetYesNoLabels("Install to disk", "View build log")
+
+        self.on_install() if dialog.ShowModal() == wx.ID_YES else self.install_button.Enable()
+
+
+    def _build(self) -> None:
+        """
+        Calls build function and redirects stdout to the text box
+        """
+        logger = logging.getLogger()
+        logger.addHandler(gui_support.ThreadHandler(self.text_box))
+        try:
+            build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants)
+        except:
+            logging.error("An internal error occurred while building:\n")
+            logging.error(traceback.format_exc())
+        logger.removeHandler(logger.handlers[2])
+
+
+    def on_return_to_main_menu(self, event: wx.Event = None) -> None:
+        """
+        Return to main menu
+        """
+        self.frame_modal.Hide()
+        main_menu_frame = gui_main_menu.MainFrame(
+            None,
+            title=self.title,
+            global_constants=self.constants,
+            screen_location=self.GetScreenPosition()
+        )
+        main_menu_frame.Show()
+        self.frame_modal.Destroy()
+        self.Destroy()
+
+
+    def on_install(self, event: wx.Event = None) -> None:
+        """
+        Launch install frame
+        """
+        self.frame_modal.Destroy()
+        self.Destroy()
+        install_oc_frame = gui_install_oc.InstallOCFrame(
+            None,
+            title=self.title,
+            global_constants=self.constants,
+            screen_location=self.GetScreenPosition()
+        )
+        install_oc_frame.Show()
+
+

resources/wx_gui/gui_download.py

@@ -0,0 +1,104 @@
+# Generate UI for downloading files
+import wx
+import logging
+
+from resources import (
+    constants,
+    network_handler,
+    utilities
+)
+
+
+class DownloadFrame(wx.Frame):
+    """
+    Update provided frame with download stats
+    """
+    def __init__(self, parent: wx.Frame, title: str, global_constants: constants.Constants, download_obj: network_handler.DownloadObject, item_name: str) -> None:
+        logging.info("Initializing Download Frame")
+        self.constants: constants.Constants = global_constants
+        self.title: str = title
+        self.parent: wx.Frame = parent
+        self.download_obj: network_handler.DownloadObject = download_obj
+        self.item_name: str = item_name
+
+        self.user_cancelled: bool = False
+
+        self.frame_modal = wx.Dialog(parent, title=title, size=(400, 200))
+
+        self._generate_elements(self.frame_modal)
+
+
+    def _generate_elements(self, frame: wx.Dialog = None) -> None:
+        """
+        Generate elements for download frame
+        """
+
+        frame = self if not frame else frame
+
+        title_label = wx.StaticText(frame, label=f"Downloading: {self.item_name}", pos=(-1,5))
+        title_label.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont"))
+        title_label.Centre(wx.HORIZONTAL)
+
+        label_amount = wx.StaticText(frame, label="0.00 B downloaded of 0.00B (0.00%)", pos=(-1, title_label.GetPosition()[1] + title_label.GetSize()[1] + 5))
+        label_amount.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
+        label_amount.Centre(wx.HORIZONTAL)
+
+        label_speed = wx.StaticText(frame, label="Average download speed: Unknown", pos=(-1, label_amount.GetPosition()[1] + label_amount.GetSize()[1] + 5))
+        label_speed.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
+        label_speed.Centre(wx.HORIZONTAL)
+
+        label_est_time = wx.StaticText(frame, label="Estimated time remaining: Unknown", pos=(-1, label_speed.GetPosition()[1] + label_speed.GetSize()[1] + 5))
+        label_est_time.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont"))
+        label_est_time.Centre(wx.HORIZONTAL)
+
+        progress_bar = wx.Gauge(frame, range=100, pos=(-1, label_est_time.GetPosition()[1] + label_est_time.GetSize()[1] + 5), size=(300, 20))
+        progress_bar.Centre(wx.HORIZONTAL)
+
+        return_button = wx.Button(frame, label="Return", pos=(-1, progress_bar.GetPosition()[1] + progress_bar.GetSize()[1] + 5))
+        return_button.Bind(wx.EVT_BUTTON, lambda event: self.terminate_download())
+        return_button.Centre(wx.HORIZONTAL)
+
+        # Set size of frame
+        frame.SetSize((-1, return_button.GetPosition()[1] + return_button.GetSize()[1] + 40))
+        frame.ShowWindowModal()
+
+        self.download_obj.download()
+        while self.download_obj.is_active():
+            percentage: int = self.download_obj.get_percent()
+
+            if percentage == -1:
+                amount_str = f"{utilities.human_fmt(self.download_obj.downloaded_file_size)} downloaded"
+                progress_bar.Pulse()
+            else:
+                amount_str = f"{utilities.human_fmt(self.download_obj.downloaded_file_size)} downloaded of {utilities.human_fmt(self.download_obj.total_file_size)} ({percentage:.2f}%)"
+                progress_bar.SetValue(int(percentage))
+
+            label_amount.SetLabel(amount_str)
+            label_amount.Centre(wx.HORIZONTAL)
+
+            label_speed.SetLabel(
+                f"Average download speed: {utilities.human_fmt(self.download_obj.get_speed())}/s"
+            )
+
+            label_est_time.SetLabel(
+                f"Estimated time remaining: {utilities.seconds_to_readable_time(self.download_obj.get_time_remaining())}"
+            )
+
+            wx.Yield()
+
+        if self.download_obj.download_complete is False and self.user_cancelled is False:
+            wx.MessageBox(f"Download failed: \n{self.download_obj.error_msg}", "Error", wx.OK | wx.ICON_ERROR)
+
+        frame.Destroy()
+
+
+    def terminate_download(self) -> None:
+        """
+        Terminate download
+        """
+        if wx.MessageBox("Are you sure you want to cancel the download?", "Cancel Download", wx.YES_NO | wx.ICON_QUESTION | wx.NO_DEFAULT) == wx.YES:
+            logging.info("User cancelled download")
+            self.user_cancelled = True
+            self.download_obj.stop()
+
+

resources/wx_gui/gui_entry.py

@@ -0,0 +1,92 @@
+# Entry point for the wxPython GUI
+import wx
+import sys
+import atexit
+import logging
+
+from resources import constants
+from resources.wx_gui import (
+    gui_main_menu,
+    gui_build,
+    gui_install_oc,
+    gui_sys_patch_start,
+    gui_update,
+)
+from resources.sys_patch import sys_patch_detect
+
+
+class SupportedEntryPoints:
+    """
+    Enum for supported entry points
+    """
+    MAIN_MENU  = gui_main_menu.MainFrame
+    BUILD_OC   = gui_build.BuildFrame
+    INSTALL_OC = gui_install_oc.InstallOCFrame
+    SYS_PATCH  = gui_sys_patch_start.SysPatchStartFrame
+    UPDATE_APP = gui_update.UpdateFrame
+
+
+class EntryPoint:
+
+    def __init__(self, global_constants: constants.Constants) -> None:
+        self.app: wx.App = None
+        self.main_menu_frame: gui_main_menu.MainFrame = None
+        self.constants: constants.Constants = global_constants
+
+        self.constants.gui_mode = True
+
+
+    def _generate_base_data(self) -> None:
+        self.app = wx.App()
+        self.app.SetAppName(self.constants.patcher_name)
+
+
+    def start(self, entry: SupportedEntryPoints = gui_main_menu.MainFrame) -> None:
+        """
+        Launches entry point for the wxPython GUI
+        """
+        self._generate_base_data()
+
+        if "--gui_patch" in sys.argv or "--gui_unpatch" in sys.argv:
+            entry = gui_sys_patch_start.SysPatchStartFrame
+            patches = sys_patch_detect.DetectRootPatch(self.constants.computer.real_model, self.constants).detect_patch_set()
+
+        logging.info(f"Entry point set: {entry.__name__}")
+
+        # Normally set by main.py, but transitions from CLI mode may not have this set
+        self.constants.gui_mode = True
+
+        self.frame: wx.Frame = entry(
+            None,
+            title=f"{self.constants.patcher_name} ({self.constants.patcher_version})",
+            global_constants=self.constants,
+            screen_location=None,
+            **({"patches": patches} if "--gui_patch" in sys.argv or "--gui_unpatch" in sys.argv else {})
+        )
+
+        atexit.register(self.OnCloseFrame)
+
+        if "--gui_patch" in sys.argv:
+            self.frame.start_root_patching()
+        elif "--gui_unpatch" in sys.argv:
+            self.frame.revert_root_patching()
+
+        self.app.MainLoop()
+
+
+    def OnCloseFrame(self, event: wx.Event = None) -> None:
+        """
+        Closes the wxPython GUI
+        """
+
+        if not self.frame:
+            return
+
+        logging.info("Cleaning up wxPython GUI")
+
+        self.frame.SetTransparent(0)
+        wx.Yield()
+
+        self.frame.DestroyChildren()
+        self.frame.Destroy()
+        self.app.ExitMainLoop()