Sync changelog

Work-around Macs not respecting DefaultBackgroundColor

.github/workflows/build_test_deploy.yml

@@ -0,0 +1,35 @@
+name: Build/Test/Deploy
+on:
+  push:
+    branches-ignore:
+      - gh-pages
+  workflow_dispatch:
+  pull_request:
+jobs:
+  build:
+    name: Build Site and Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-node@v2-beta
+        with:
+          node-version: '12'
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+          persist-credentials: false
+          submodules: 'recursive'
+      - name: Install
+        run: npm install
+        working-directory: 'docs'
+      - name: Build
+        run: npm run build
+        working-directory: 'docs'
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        with:
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: docs/.vuepress/dist/
+          CLEAN: true

.github/workflows/main.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    name: Build
+    name: Build App
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -7,3 +7,8 @@
 __pycache__/
 *.py[cod]
 *$py.class
+/docs/.vuepress/dist
+/docs/.vuepress/.config.js.swp
+/docs/yarn.lock
+/docs/yarn-error.log
+/docs/node_modules/

CHANGELOG.md

@@ -1,5 +1,26 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.0.17
+- Fix build detection breaking on older OS
+
+## 0.0.16
+- Move Serial selection to Patcher Settings
+- Add new SMBIOS patching options:
+  - Minimal:  Only update board ID and BIOSVersion, keep original serials
+  - Moderate: Update entire SMBIOS, keep original serials
+  - Advanced: Update entire SMBIOS, generate new serials
+- Fix crash on MacBookPro4,1
+- Fix External Display Support on MacBookPro10,1
+- Inject Patcher version into NVRAM for easier debugging
+- Add user-configurable ShowPicker
+- Add user-configurable Vaulting, enabled by default
+- Add user-configurable SIP and SecureBootModel
+- Fix USB Maps not working on "Minimal" SMBIOS
+- Fix GPU vendor user-configuration
+- Fix custom EFI Boot icon in Mac Boot Picker
+- Enable UserInterfaceTheme to ensure DefaultBackgroundColor is respected
+- Enable `amfi_get_out_of_my_way=1` when SIP is disabled
+
 ## 0.0.15
 - Add user-configurable OpenCore DEBUG builds
 - Add user-configurable Wifi and GPU patches

OpenCore-Patcher.command

@@ -2,7 +2,7 @@
 
 from __future__ import print_function
 
-import subprocess, sys, time
+import subprocess, sys, time, platform
 
 from Resources import build, ModelArray, Constants, utilities
 
@@ -18,6 +18,8 @@ class OpenCoreLegacyPatcher():
         else:
             self.current_model = subprocess.run("system_profiler SPHardwareDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             self.current_model = [line.strip().split(": ", 1)[1] for line in self.current_model.stdout.decode().split("\n") if line.strip().startswith("Model Identifier")][0]
+        self.constants.detected_os, _, _ = platform.mac_ver()
+        self.constants.detected_os = float('.'.join(self.constants.detected_os.split('.')[:2]))
 
     def build_opencore(self):
         build.BuildOpenCore(self.constants.custom_model or self.current_model, self.constants).build_opencore()
@@ -60,7 +62,7 @@ Current target:\t{self.constants.os_support}
             ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS11
         elif temp_os_support == 12.0:
             ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS12
-    
+
     def change_verbose(self):
         utilities.cls()
         utilities.header(["Set Verbose mode"])
@@ -94,31 +96,42 @@ Current target:\t{self.constants.os_support}
             self.constants.kext_debug = False
         else:
             print("Invalid option")
-    
+
     def change_metal(self):
         utilities.cls()
         utilities.header(["Assume Metal GPU Always in iMac"])
         print("""This is for iMacs that have upgraded Metal GPUs, otherwise
 Patcher assumes based on stock configuration (ie. iMac10,x-12,x)
 
+Valid Options:
+
+1. None(stock GPU)
+2. Nvidia GPU
+3. AMD GPU
+
 Note: Patcher will detect whether hardware has been upgraded regardless, this
-option is for those patching on a different machine.
+option is for those patching on a different machine or OCLP cannot detect.
         """)
-        change_kext_menu = input("Enable Metal GPU build algorithm?(y/n): ")
-        if change_kext_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.metal_build = True
-        elif change_kext_menu in {"n", "N", "no", "No"}:
+        change_kext_menu = input("Set GPU Patch type(ie. 1): ")
+        if change_kext_menu == "1":
             self.constants.metal_build = False
+            self.constants.imac_vendor = "None"
+        elif change_kext_menu == "2":
+            self.constants.metal_build = True
+            self.constants.imac_vendor = "Nvidia"
+        elif change_kext_menu == "3":
+            self.constants.metal_build = True
+            self.constants.imac_vendor = "AMD"
         else:
             print("Invalid option")
-    
+
     def change_wifi(self):
         utilities.cls()
         utilities.header(["Assume Upgraded Wifi Always"])
         print("""This is for Macs with upgraded wifi cards(ie. BCM94360/2)
 
 Note: Patcher will detect whether hardware has been upgraded regardless, this
-option is for those patching on a different machine.
+option is for those patching on a different machine or cannot detect.
         """)
         change_kext_menu = input("Enable Upgraded Wifi build algorithm?(y/n): ")
         if change_kext_menu in {"y", "Y", "yes", "Yes"}:
@@ -128,6 +141,112 @@ option is for those patching on a different machine.
         else:
             print("Invalid option")
 
+    def change_serial(self):
+        utilities.cls()
+        utilities.header(["Set SMBIOS Mode"])
+        print("""This section is for setting how OpenCore generates the SMBIOS
+Recommended for adanced users who want control how serials are handled
+
+Valid options:
+
+1. Minimal:\tUse original serials and minimally update SMBIOS
+2. Moderate:\tReplave entire SMBIOS but keep original serials
+3. Advanced:\tReplace entire SMBIOS and generate new serials
+
+Note: For new users we recommend leaving as default(1. Minimal)
+        """)
+        change_serial_menu = input("Set SMBIOS Mode(ie. 1): ")
+        if change_serial_menu == "1":
+            self.constants.serial_settings = "Minimal"
+        elif change_serial_menu == "2":
+            self.constants.serial_settings = "Moderate"
+        elif change_serial_menu == "3":
+            self.constants.serial_settings = "Advanced"
+        else:
+            print("Invalid option")
+    def change_showpicker(self):
+        utilities.cls()
+        utilities.header(["Set OpenCore Picker mode"])
+        print("""By default, OpenCore will show its boot picker each time on boot up,
+however this can be disabled by default and be shown on command by repeatedly
+pressing the "Esc" key
+        """)
+        change_kext_menu = input("Show OpenCore Picker by default(y/n): ")
+        if change_kext_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.showpicker = True
+        elif change_kext_menu in {"n", "N", "no", "No"}:
+            self.constants.showpicker = False
+        else:
+            print("Invalid option")
+
+    def change_vault(self):
+        utilities.cls()
+        utilities.header(["Set OpenCore Vaulting"])
+        print("""By default, this patcher will sign all your files and ensure none of the
+contents can be tampered with. However for more advanced users, you may
+want to be able to freely edit the config.plist and files.
+
+Note: For secuirty reasons, OpenShell will be disabled when Vault is set.
+
+        """)
+        change_kext_menu = input("Enable Vault(y/n): ")
+        if change_kext_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.vault = True
+        elif change_kext_menu in {"n", "N", "no", "No"}:
+            self.constants.vault = False
+        else:
+            print("Invalid option")
+
+    def change_sip(self):
+        utilities.cls()
+        utilities.header(["Set SIP and SecureBootModel"])
+        print("""SIP and SecureBootModel are used to ensure proper OTA functionality,
+however to patch the root volume both of these must be disabled.
+Only disable is absolutely necessary.
+
+Note: for minor changes, SIP can be adjusted in recovery like normal.
+Additionally, when disabling SIP via the patcher amfi_get_out_of_my_way=1
+will be added to boot-args.
+
+Valid options:
+
+1. Enable Both
+2. Disable SIP only
+3. Disable SecureBootModel Only
+4. Disable Both
+
+        """)
+        change_kext_menu = input("Set SIP and SecureBootModel(ie. 1): ")
+        if change_kext_menu == "1":
+            self.constants.sip_status = True
+            self.constants.secure_status = True
+        elif change_kext_menu == "2":
+            self.constants.sip_status = False
+            self.constants.secure_status = True
+        elif change_kext_menu == "3":
+            self.constants.sip_status = True
+            self.constants.secure_status = False
+        elif change_kext_menu == "4":
+            self.constants.sip_status = False
+            self.constants.secure_status = False
+        else:
+            print("Invalid option")
+
+    def change_imac_nvidia(self):
+        utilities.cls()
+        utilities.header(["Force iMac Nvidia Patches"])
+        print("""Specifically for iMac10,x-12,x with Metal Nvidia GPU upgrades
+By default the patcher will try to detect what hardware is
+running, however this will enforce iMac Nvidia Build Patches.
+        """)
+        change_kext_menu = input("Assume iMac Nvidia patches(y/n): ")
+        if change_kext_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.imac_nvidia_build = True
+        elif change_kext_menu in {"n", "N", "no", "No"}:
+            self.constants.imac_nvidia_build = False
+        else:
+            print("Invalid option")
+
     def patcher_settings(self):
         response = None
         while not (response and response == -1):
@@ -141,18 +260,19 @@ option is for those patching on a different machine.
                 [f"Enable Verbose Mode:\t\tCurrently {self.constants.verbose_debug}", self.change_verbose],
                 [f"Enable OpenCore DEBUG:\t\tCurrently {self.constants.opencore_debug}", self.change_oc],
                 [f"Enable Kext DEBUG:\t\t\tCurrently {self.constants.kext_debug}", self.change_kext],
-                [f"Assume Metal GPU Always:\t\tCurrently {self.constants.kext_debug}", self.change_metal],
-                [f"Assume Upgraded Wifi Always:\tCurrently {self.constants.kext_debug}", self.change_wifi],
+                [f"Force iMac Metal Patch:\t\tCurrently {self.constants.imac_vendor}", self.change_metal],
+                [f"Assume Upgraded Wifi Always:\tCurrently {self.constants.wifi_build}", self.change_wifi],
+                [f"Set ShowPicker Mode:\t\tCurrently {self.constants.showpicker}", self.change_showpicker],
+                [f"Set Vault Mode:\t\t\tCurrently {self.constants.vault}", self.change_vault],
+                [f"Set SIP and SecureBootModel:\tSIP: {self.constants.sip_status} SBM: {self.constants.secure_status}", self.change_sip],
+                [f"Set SMBIOS Mode:\t\t\tCurrently {self.constants.serial_settings}", self.change_serial],
             ]
 
             for option in options:
                 menu.add_menu_option(option[0], function=option[1])
-        
+
             response = menu.start()
 
-
-            input("Press any key to continue...")
-
     def credits(self):
         utilities.TUIOnlyPrint(["Credits"], "Press [Enter] to go back.\n",
                                ["""Many thanks to the following:
@@ -171,7 +291,7 @@ option is for those patching on a different machine.
             title = [
                 f"OpenCore Legacy Patcher v{self.constants.patcher_version}",
                 f"Selected Model: {self.constants.custom_model or self.current_model}",
-                f"Target OS: macOS {self.constants.os_support}"
+                f"Target OS: macOS {self.constants.os_support}",
             ]
 
             if (self.constants.custom_model or self.current_model) not in ModelArray.SupportedSMBIOS:
@@ -196,8 +316,8 @@ option is for those patching on a different machine.
 
             menu = utilities.TUIMenu(title, "Please select an option: ", in_between=in_between, auto_number=True, top_level=True)
 
-            options = ([["Build OpenCore", self.build_opencore]] if ((self.constants.custom_model or self.current_model) in ModelArray.SupportedSMBIOS) else []) + [
-                ["Install OpenCore to USB/internal drive", self.install_opencore],
+            options = (
+                [["Build OpenCore", self.build_opencore]] if ((self.constants.custom_model or self.current_model) in ModelArray.SupportedSMBIOS) else []) + ([["Install OpenCore to USB/internal drive", self.install_opencore]] if (self.constants.detected_os > 10.12) else []) + [
                 ["Change Model", self.change_model],
                 ["Patcher Settings", self.patcher_settings],
                 ["Credits", self.credits]

README.md

@@ -2,12 +2,12 @@
 
 <img src="images/OC-Patcher.png" width="256">
 
-A python script for building and booting OpenCore on legacy Macs, see [Supported SMBIOS](/docs/MODELS.md) on whether your model is supported.
+A python program for building and booting OpenCore on legacy Macs, see [Supported SMBIOS](https://dortania.github.io/OpenCore-Legacy-Patcher/MODELS.html) on whether your model is supported.
 
 Supported features:
 
-* System Integrity Protection, FileVault 2 and .im4m Secure Boot
-* Native OTA OS updates
+* System Integrity Protection, FileVault 2, .im4m Secure Boot and Vaulting
+* Native OTA OS DELTA updates on all Macs
 * Recovery OS, Safe Mode and Single-user Mode booting
 * Zero firmware patching required(ie. APFS ROM patching)
 * GPU Switching on MacBook Pro models(2012 and newer)
@@ -19,58 +19,17 @@ Note: Only clean-installs and upgrades are supported, installs already patched w
 Note 2: Currently OpenCore Legacy Patcher only supports macOS 11, Big Sur installs. For older OSes, please use [Dosdude1's patchers](http://dosdude1.com)
 
 ## How to use
+See the online guide on how:
 
-To use, simply:
-
-1. Ensure your hardware is compatible(See [Supported SMBIOS](/docs/MODELS.md))
-2. Download and build macOS Installer
-3. Download the latest release: [OpenCore Legacy Patcher Releases](https://github.com/dortania/Opencore-Legacy-Patcher/releases)
-4. Run the `OpenCore-Patcher.app`
-5. Run `Build OpenCore`(if building for another machine, please select `Change Model`)
-
-| First Run | Build EFI |
-| :--- | :--- |
-| ![](images/first-run.png) | ![](images/build-efi.png) |
-
-  * Note: When the patcher ask you to if you want to use original serials, we recommend doing so. To determine yourself if you want:
-    * Original: Mac is nearly identical to pre-patcher, with only minor changes in SMBIOS. Ideal configuration for iServices to work correctly
-	* Custom: Rebuilds SMBIOS table to Mac you're spoofing, generally recommended when troubleshooting such as APFS support missing in the installer
-
-6. Run `Install OpenCore to USB/internal drive`
-
-| Select Drive | Select EFI/FAT32 Partition |
-| :--- | :--- |
-| ![](images/disk-start.png) | ![](images/disk-efi.png) |
-
-  * Ensure you install OpenCore onto a FAT32 partition to ensure your Mac is able to boot it, you may need to format your drive as GUID/GPT in Disk Utility
-  
-7. Reboot machine while holding `Option` to select OpenCore, then boot the macOS Installer
-
-| Mac Boot Picker | OpenCore Picker |
-| :--- | :--- |
-| ![](images/efi-boot.png) | ![](images/oc-boot.png) |
-
-For nightly builds, you can either run `OpenCore-Patcher.command` from [main](https://github.com/dortania/Opencore-Legacy-Patcher/archive/main.zip) or grab the binary from  [Github Actions](https://github.com/dortania/Opencore-Legacy-Patcher/actions). Note the latter does not require a py3 install.
-
-## How to uninstall OpenCore?
-
-To remove OpenCore is actually quite simply:
-
-1. Remove OpenCore either from the USB or internal drive
-  * You'll need to mount the drive's EFI partition, and delete the EFI folder
-  * [See here for example how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
-2. Reset NVRAM
-  * [Reset NVRAM or PRAM on your Mac](https://support.apple.com/HT204063)
-  
-Know that if you are on Big Sur when you remove the EFI folder, your Mac will no longer boot and show the prohibited symbol. Be ready to install an older version of macOS before you uninstall OpenCore.
+* [OpenCore Legacy Patcher Guide](https://dortania.github.io/OpenCore-Legacy-Patcher/)
 
 ## Patcher Warnings
 
 Since this patcher tricks macOS into thinking you're running a newer Mac, certain functionality may be broken:
 
 * Boot Camp Assistant.app
-  * We recommend running the assistant on a natively supported OS
+  * We recommend running the assistant on a natively supported OS, running via the patcher may result in unforeseen issues
 * Legacy Windows Booting
   * Currently OpenCore cannot boot MBR-based installs, so Ivy Bridge and older Machines may not be able to see Windows in OpenCore's Boot Picker
-
-## [Troubleshooting](/docs/TROUBLESHOOTING.md)
+* Boot Buddy support
+  * Due to how OpenCore overwrites NVRAM , the usage of Boot Buddy and such tools are **highly** in-advised 

Resources/Constants.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 class Constants:
     def __init__(self):
-        self.patcher_version = "0.0.15"
+        self.patcher_version = "0.0.17"
         self.opencore_commit = "7bb41aa - 2021-03-06"
         self.opencore_version = "0.6.8"
         self.lilu_version = "1.5.1"
@@ -47,7 +47,15 @@ class Constants:
         self.min_os_support = 11.0
         self.max_os_support = 11.0
         self.metal_build = False
+        self.imac_vendor = "None"
         self.wifi_build = False
+        self.gui_mode = False
+        self.serial_settings = "Minimal"
+        self.showpicker = True
+        self.vault = True
+        self.sip_status = True
+        self.secure_status = True
+        self.detected_os = 0.0
 
     # Payload Location
     # OpenCore
@@ -134,6 +142,8 @@ class Constants:
     # Tools
     @property
     def macserial_path(self): return self.payload_path / Path("Tools/macserial")
+    @property
+    def vault_path(self): return self.payload_path / Path("Tools/CreateVault/sign.command")
 
     # Icons
     @property

Resources/ModelArray.py

@@ -241,7 +241,7 @@ WifiBCM94331 = [
     "Macmini5,3",    # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "Macmini6,1",    # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "Macmini6,2",    # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "iMac9,1",       # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
+    #"iMac9,1",       # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
     "iMac13,1",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
     "iMac13,2",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
     "MacPro5,1",     # PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)
@@ -390,7 +390,6 @@ DualGPUPatch = [
     "MacBookPro8,2",
     "MacBookPro8,3",
     "MacBookPro9,1",
-    "MacBookPro10,1",
     "Macmini5,2",
     "iMac12,1",
     "iMac12,2",
@@ -400,6 +399,10 @@ DualGPUPatch = [
     "Dortania1,1"
 ]
 
+DualGPUPatchRetina = [
+    "MacBookPro10,1",
+]
+
 HiDPIpicker = [
     "MacBookPro10,1",
     "MacBookPro10,2",
@@ -691,7 +694,6 @@ OHC1 = [
     "MacBookAir2,1",
     "MacBookAir3,1",
     "MacBookAir3,2",
-    "MacBookPro4,1",
     "MacBookPro5,1",
     "MacBookPro5,2",
     "MacBookPro5,3",
@@ -735,15 +737,15 @@ upgradableMXMGPUs = [
 NVIDIAMXMGPUs = [
     "0x12b9",#Quadro K610M
     "0x0ff6",#Quadro K1100M
-    "0x11fc",#Quadro K2100M 
-    "0x0ffc",#Quadro K1000M 
-    "0x0ffb",#Quadro K2000M 
-    "0x11b6",#Quadro K3100M 
-    "0x11b7",#Quadro K4100M 
-    "0x11bc",#Quadro K5000M 
-    "0x11b8",#Quadro K5100M 
+    "0x11fc",#Quadro K2100M
+    "0x0ffc",#Quadro K1000M
+    "0x0ffb",#Quadro K2000M
+    "0x11b6",#Quadro K3100M
+    "0x11b7",#Quadro K4100M
+    "0x11bc",#Quadro K5000M
+    "0x11b8",#Quadro K5100M
     "0x11e1",#GTX 765M
-    "0x11e2",#GTX 765M 
+    "0x11e2",#GTX 765M
     "0x11e0",#GTX 770M
     "0x119e",#GTX 780M Mac Edition
     "0x119e",#GTX 780M
@@ -756,8 +758,8 @@ NVIDIAMXMGPUs = [
 
 AMDMXMGPUs = [
     "0x67EF",#AMD RX 460
-    "0x67e8",#AMD WX 4130/WX 4150 
-    "0x67e0",#AMD WX 4170 
+    "0x67e8",#AMD WX 4130/WX 4150
+    "0x67e0",#AMD WX 4170
     "0x67c0",#AMD WX 7100
 ]
 
@@ -800,6 +802,7 @@ NightShiftExclude = [
 ]
 
 UGAtoGOP = [
+    "MacBookPro4,1",
     "MacPro3,1"
 ]
 

Resources/build.py

@@ -69,6 +69,7 @@ class BuildOpenCore:
         self.config["#Revision"]["Build-Version"] = f"{self.constants.patcher_version} - {date.today()}"
         self.config["#Revision"]["OpenCore-Version"] = f"{self.constants.opencore_version} - {self.constants.opencore_build} - {self.constants.opencore_commit}"
         self.config["#Revision"]["Original-Model"] = self.model
+        self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Version"] = f"{self.constants.patcher_version}"
 
         for name, version, path, check in [
             # Essential kexts
@@ -93,9 +94,10 @@ class BuildOpenCore:
             self.enable_kext(name, version, path, check)
 
         # WiFi patches
+        # TODO: -a is not supported in Lion and older, need to add proper fix
         wifi_devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
         wifi_devices = [i for i in wifi_devices if i["vendor-id"] == binascii.unhexlify("E4140000") and i["class-code"] == binascii.unhexlify("00800200")]
-        if self.constants.wifi_build == True:
+        if self.constants.wifi_build is True:
             print("- Skipping Wifi patches on request")
         elif not self.constants.custom_model and wifi_devices and self.hexswap(binascii.hexlify(wifi_devices[0]["device-id"]).decode()[:4]) in ModelArray.nativeWifi:
             print("- Found supported WiFi card, skipping wifi patches")
@@ -124,7 +126,7 @@ class BuildOpenCore:
                     property_path = "PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)"
                 print("- Applying fake ID for WiFi")
                 self.config["DeviceProperties"]["Add"][property_path] = {"device-id": binascii.unhexlify("ba430000"), "compatible": "pci14e4,43ba"}
-        
+
         # CPUFriend
         pp_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/PlatformPlugin/{self.model}/Info.plist")
         if self.model in ModelArray.X86PP:
@@ -151,7 +153,7 @@ class BuildOpenCore:
             Path(self.constants.map_contents_folder).mkdir()
             shutil.copy(usb_map_path, self.constants.map_contents_folder)
             self.get_kext_by_bundle_path("USB-Map.kext")["Enabled"] = True
-        
+
         # AGPM Patch
         if self.model in ModelArray.DualGPUPatch:
             print("- Adding dual GPU patch")
@@ -161,35 +163,51 @@ class BuildOpenCore:
         if self.model in ModelArray.HiDPIpicker:
             print("- Setting HiDPI picker")
             self.config["NVRAM"]["Add"]["4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"]["UIScale"] = binascii.unhexlify("02")
-        
+
+
+        def nvidia_patch(self):
+            self.constants.custom_mxm_gpu = True
+            print("- Adding Nvidia Brightness Control patches")
+            if self.model in ["iMac11,1", "iMac11,2", "iMac11,3"]:
+                backlight_path = "PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"
+                self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
+                shutil.copy(self.constants.backlight_path, self.constants.kexts_path)
+                self.get_kext_by_bundle_path("AppleBacklightFixup.kext")["Enabled"] = True
+            elif self.model in ["iMac12,1", "iMac12,2"]:
+                backlight_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
+                self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
+                print("- Disabling unsupported iGPU")
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+            else:
+                print("- Failed to determine model")
+
+        def amd_patch(self):
+            self.constants.custom_mxm_gpu = True
+            print("- Adding AMD DRM patches")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=80 unfairgva=1"
+            if self.model in ["iMac12,1", "iMac12,2"]:
+                print("- Disabling unsupported iGPU")
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+
+
         # Check GPU Vendor
-        if self.constants.metal_build == True:
+        if self.constants.metal_build is True:
             print("- Adding Metal GPU patches on request")
+            if self.constants.imac_vendor == "AMD":
+                amd_patch(self)
+            elif self.constants.imac_vendor == "Nvidia":
+                nvidia_patch(self)
+            else:
+                print("- Failed to find vendor")
         elif self.constants.custom_model == "None":
             current_gpu: str = subprocess.run("system_profiler SPDisplaysDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
             self.constants.current_gpuv = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Vendor"))][0]
             self.constants.current_gpud = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Device ID"))][0]
             print(f"- Detected GPU: {self.constants.current_gpuv} {self.constants.current_gpud}")
             if (self.constants.current_gpuv == "AMD (0x1002)") & (self.constants.current_gpud in ModelArray.AMDMXMGPUs):
-                self.constants.custom_mxm_gpu = True
-                print("- Adding AMD DRM patches")
-                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=80 unfairgva=1"
-                if self.model in ["iMac12,1", "iMac12,2"]:
-                    print("- Disabling unsupported iGPU")
-                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+                amd_patch(self)
             elif (self.constants.current_gpuv == "NVIDIA (0x10de)") & (self.constants.current_gpud in ModelArray.NVIDIAMXMGPUs):
-                self.constants.custom_mxm_gpu = True
-                print("- Adding Brightness Control patches")
-                if self.model in ["iMac11,1", "iMac11,2", "iMac11,3"]:
-                    backlight_path = "PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"
-                    self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
-                    shutil.copy(self.constants.backlight_path, self.constants.kexts_path)
-                    self.get_kext_by_bundle_path("AppleBacklightFixup.kext")["Enabled"] = True
-                elif self.model in ["iMac12,1", "iMac12,2"]:
-                    backlight_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
-                    self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
-                    print("- Disabling unsupported iGPU")
-                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+                nvidia_patch(self)
 
         # Add OpenCanopy
         print("- Adding OpenCanopy GUI")
@@ -208,17 +226,36 @@ class BuildOpenCore:
             self.config["Kernel"]["Quirks"]["ThirdPartyDrives"] = True
 
         #DEBUG Settings
-        if self.constants.verbose_debug == True:
+        if self.constants.verbose_debug is True:
             print("- Enabling Verbose boot")
             self.config["Kernel"]["Quirks"]["PanicNoKextDump"] = True
             self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -v"
-        if self.constants.kext_debug == True:
+        if self.constants.kext_debug is True:
             print("- Enabling DEBUG Kexts")
             self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -liludbgall"
             self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " msgbuf=1048576"
-        if self.constants.opencore_debug == True:
+        if self.constants.opencore_debug is True:
             print("- Enabling DEBUG OpenCore")
             self.config["Misc"]["Debug"]["Target"] = 67
+        if self.constants.showpicker is True:
+            print("- Enabling ShowPicker")
+            self.config["Misc"]["Boot"]["ShowPicker"] = True
+        else:
+            print("- Hiding picker and enabling PollAppleHotKeys")
+            self.config["Misc"]["Boot"]["ShowPicker"] = False
+            self.config["Misc"]["Boot"]["PollAppleHotKeys"] = True
+        if self.constants.vault is True:
+            print("- Setting Vault configuration")
+            self.config["Misc"]["Security"]["Vault"] = "Secure"
+            self.get_tool_by__path("OpenShell.efi")["Enabled"] = False
+        if self.constants.sip_status is False:
+            print("- Disabling SIP")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["csr-active-config"] = binascii.unhexlify("FF0F0000")
+            self.config["NVRAM"]["Delete"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"] += ["csr-active-config"]
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " amfi_get_out_of_my_way=1"
+        if self.constants.secure_status is False:
+            print("- Disabling SecureBootModel")
+            self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled"
 
     def set_smbios(self):
         spoofed_model = self.model
@@ -245,7 +282,7 @@ class BuildOpenCore:
             spoofed_board = "Mac-35C5E08120C7EEAF"
         elif self.model in ModelArray.iMac151:
             # Check for upgraded GPUs on iMacs
-            if self.constants.metal_build == True:
+            if self.constants.metal_build is True:
                 print("- Spoofing to iMacPro1,1")
                 spoofed_model = "iMacPro1,1"
                 spoofed_board = "Mac-7BA5B2D9E42DDD94"
@@ -269,64 +306,72 @@ class BuildOpenCore:
             print("- Spoofing to MacPro7,1")
             spoofed_model = "MacPro7,1"
             spoofed_board = "Mac-27AD2F918AE68F61"
-        self.config["#Revision"]["Spoofed-Model"] = spoofed_model
-        macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {spoofed_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        macserial_output = macserial_output.stdout.decode().strip().split(" | ")
+        self.spoofed_model = spoofed_model
+        self.spoofed_board = spoofed_board
+        self.config["#Revision"]["Spoofed-Model"] = self.spoofed_model
 
         # Setup menu
-        smbios_mod = True
-        while smbios_mod == True:
-            print("Use original or generate new serials")
-            print("For new users, we recommend use originals(ie. y)")
-            smbios_mod = input("Use original serials?(y, n): ")
+        def minimal_serial_patch(self):
+            self.config["PlatformInfo"]["PlatformNVRAM"]["BID"] = self.spoofed_board
+            self.config["PlatformInfo"]["SMBIOS"]["BoardProduct"] = self.spoofed_board
+            self.config["PlatformInfo"]["UpdateNVRAM"] = True
+        def moderate_serial_patch(self):
+            self.config["PlatformInfo"]["Automatic"] = True
+            self.config["PlatformInfo"]["UpdateDataHub"] = True
+            self.config["PlatformInfo"]["UpdateNVRAM"] = True
+            self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
+            self.config["PlatformInfo"]["Generic"]["SystemProductName"] = self.spoofed_model
+        def adanced_serial_patch(self):
+            macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {self.spoofed_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            macserial_output = macserial_output.stdout.decode().strip().split(" | ")
+            self.config["PlatformInfo"]["Automatic"] = True
+            self.config["PlatformInfo"]["UpdateDataHub"] = True
+            self.config["PlatformInfo"]["UpdateNVRAM"] = True
+            self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
+            self.config["PlatformInfo"]["Generic"]["ROM"] = binascii.unhexlify("112233445566")
+            self.config["PlatformInfo"]["Generic"]["SystemProductName"] = self.spoofed_model
+            self.config["PlatformInfo"]["Generic"]["SystemSerialNumber"] = macserial_output[0]
+            self.config["PlatformInfo"]["Generic"]["MLB"] = macserial_output[1]
+            self.config["PlatformInfo"]["Generic"]["SystemUUID"] = str(uuid.uuid4()).upper()
 
-            if smbios_mod in {"y", "Y", "yes", "Yes"}:
-                spoofed_model = self.model
-                self.config["PlatformInfo"]["PlatformNVRAM"]["BID"] = spoofed_board
-                self.config["PlatformInfo"]["SMBIOS"]["BoardProduct"] = spoofed_board
-                self.config["PlatformInfo"]["UpdateNVRAM"] = True
-            elif smbios_mod in {"n", "N", "no", "No"}:
-                self.config["PlatformInfo"]["Automatic"] = True
-                self.config["PlatformInfo"]["UpdateDataHub"] = True
-                self.config["PlatformInfo"]["UpdateNVRAM"] = True
-                self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
-                self.config["PlatformInfo"]["Generic"]["SystemProductName"] = spoofed_model
-                self.config["PlatformInfo"]["Generic"]["SystemSerialNumber"] = macserial_output[0]
-                self.config["PlatformInfo"]["Generic"]["MLB"] = macserial_output[1]
-                self.config["PlatformInfo"]["Generic"]["SystemUUID"] = str(uuid.uuid4()).upper()
-            else:
-                smbios_mod = True
+        if self.constants.serial_settings == "Moderate":
+            moderate_serial_patch(self)
+        elif self.constants.serial_settings == "Advanced":
+            adanced_serial_patch(self)
+        else:
+            self.spoofed_model = self.model
+            minimal_serial_patch(self)
 
         # USB Map Patching
-        self.new_map_ls = Path(self.constants.map_contents_folder) / Path(f"Info.plist")
+        self.new_map_ls = Path(self.constants.map_contents_folder) / Path("Info.plist")
         self.map_config = plistlib.load(Path(self.new_map_ls).open("rb"))
 
-        self.map_config["IOKitPersonalities_x86_64"][self.model]["model"] = spoofed_model
+        self.map_config["IOKitPersonalities_x86_64"][self.model]["model"] = self.spoofed_model
         if self.model in ModelArray.EHCI:
-            model_EHCI = f"{self.model}-EHCI"
-            self.map_config["IOKitPersonalities_x86_64"][model_EHCI]["model"] = spoofed_model
+            model_ehci = f"{self.model}-EHCI"
+            self.map_config["IOKitPersonalities_x86_64"][model_ehci]["model"] = self.spoofed_model
         if self.model in ModelArray.EHC1:
-            model_EHC1 = f"{self.model}-EHC1"
-            self.map_config["IOKitPersonalities_x86_64"][model_EHC1]["model"] = spoofed_model
+            model_ehc1 = f"{self.model}-EHC1"
+            self.map_config["IOKitPersonalities_x86_64"][model_ehc1]["model"] = self.spoofed_model
         if self.model in ModelArray.EHC2:
-            model_EHC2 = f"{self.model}-EHC2"
-            self.map_config["IOKitPersonalities_x86_64"][model_EHC2]["model"] = spoofed_model
+            model_ehc2 = f"{self.model}-EHC2"
+            self.map_config["IOKitPersonalities_x86_64"][model_ehc2]["model"] = self.spoofed_model
         if self.model in ModelArray.OHC1:
-            model_OHC1 = f"{self.model}-OHC1"
-            model_OHC2 = f"{self.model}-OHC2"
-            self.map_config["IOKitPersonalities_x86_64"][model_OHC1]["model"] = spoofed_model
-            self.map_config["IOKitPersonalities_x86_64"][model_OHC2]["model"] = spoofed_model
+            model_ohc1 = f"{self.model}-OHC1"
+            model_ohc2 = f"{self.model}-OHC2"
+            self.map_config["IOKitPersonalities_x86_64"][model_ohc1]["model"] = self.spoofed_model
+            self.map_config["IOKitPersonalities_x86_64"][model_ohc2]["model"] = self.spoofed_model
         if self.model in ModelArray.IHEHC1:
-            model_IHEHC1 = f"{self.model}-InternalHub-EHC1"
-            model_IHEHC1IH = f"{self.model}-InternalHub-EHC1-InternalHub"
-            self.map_config["IOKitPersonalities_x86_64"][model_IHEHC1]["model"] = spoofed_model
-            self.map_config["IOKitPersonalities_x86_64"][model_IHEHC1IH]["model"] = spoofed_model
+            model_ihehc1 = f"{self.model}-InternalHub-EHC1"
+            model_ihehc1ih = f"{self.model}-InternalHub-EHC1-InternalHub"
+            self.map_config["IOKitPersonalities_x86_64"][model_ihehc1]["model"] = self.spoofed_model
+            self.map_config["IOKitPersonalities_x86_64"][model_ihehc1ih]["model"] = self.spoofed_model
         if self.model in ModelArray.IHEHC2:
-            model_IHEHC2 = f"{self.model}-InternalHub-EHC2"
-            self.map_config["IOKitPersonalities_x86_64"][model_IHEHC2]["model"] = spoofed_model
+            model_ihehc2 = f"{self.model}-InternalHub-EHC2"
+            self.map_config["IOKitPersonalities_x86_64"][model_ihehc2]["model"] = self.spoofed_model
         if self.model in ModelArray.IH:
-            model_IH = f"{self.model}-InternalHub"
-            self.map_config["IOKitPersonalities_x86_64"][model_IH]["model"] = spoofed_model
+            model_ih = f"{self.model}-InternalHub"
+            self.map_config["IOKitPersonalities_x86_64"][model_ih]["model"] = self.spoofed_model
         plistlib.dump(self.map_config, Path(self.new_map_ls).open("wb"), sort_keys=True)
 
     @staticmethod
@@ -345,6 +390,13 @@ class BuildOpenCore:
             raise IndexError
         return kext
 
+    def get_tool_by__path(self, bundle_path):
+        tool = self.get_item_by_kv(self.config["Misc"]["Tools"], "Path", bundle_path)
+        if not tool:
+            print(f"- Could not find Tool {bundle_path}!")
+            raise IndexError
+        return tool
+
     def enable_kext(self, kext_name, kext_version, kext_path, check=False):
         kext = self.get_kext_by_bundle_path(kext_name)
 
@@ -374,15 +426,22 @@ class BuildOpenCore:
 
         Path(self.constants.opencore_zip_copied).unlink()
 
+    def sign_files(self):
+        if self.constants.vault is True:
+            print("- Vaulting EFI")
+            subprocess.run([self.constants.vault_path] + f"{self.constants.oc_folder}/".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
     def build_opencore(self):
         self.build_efi()
         self.set_smbios()
         self.cleanup()
+        self.sign_files()
         print("")
         print("Your OpenCore EFI has been built at:")
         print(f"    {self.constants.opencore_release_folder}")
         print("")
-        input("Press [Enter] to go back.\n")
+        if self.constants.gui_mode is False:
+            input("Press [Enter] to go back.\n")
 
     def copy_efi(self):
         utilities.cls()
@@ -402,6 +461,8 @@ Please build OpenCore first!"""
         print("\nDisk picker is loading...")
 
         all_disks = {}
+        # TODO: physical is not supported in Sierra and older
+        # AllDisksAndPartitions is not supported in Yosemite(?) and older
         disks = plistlib.loads(subprocess.run("diskutil list -plist physical".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
         for disk in disks["AllDisksAndPartitions"]:
             disk_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
@@ -488,11 +549,10 @@ Please build OpenCore first!"""
         utilities.header(["Copying OpenCore"])
 
         if mount_path.exists():
-            print("- Coping OpenCore onto EFI partition")
             if (mount_path / Path("EFI")).exists():
-                print("Removing preexisting EFI folder")
+                print("- Removing preexisting EFI folder")
                 shutil.rmtree(mount_path / Path("EFI"), onerror=rmtree_handler)
-
+            print("- Coping OpenCore onto EFI partition")
             shutil.copytree(self.constants.opencore_release_folder / Path("EFI"), mount_path / Path("EFI"))
             shutil.copy(self.constants.icon_path, mount_path)
             print("OpenCore transfer complete")

docs/.markdownlint.json

@@ -0,0 +1,14 @@
+{
+	"default": true,
+	"line_length": false,
+	"no-alt-text": false,
+	"no-inline-html": false,
+	"header-increment": false,
+	"no-duplicate-header": false,
+	"fenced-code-language": false,
+	"no-emphasis-as-heading": false,
+	"single-title": false,
+	"ul-style": {
+		"style": "asterisk"
+	}
+}

docs/.markdownlintignore

@@ -0,0 +1,10 @@
+/node_modules/
+/_book/
+*.json
+/extra-files/
+/.git/
+/icons/
+/images/
+/styles/
+/.github/
+/.vuepress/

docs/.vuepress/config.js

@@ -0,0 +1,116 @@
+const {
+    description
+} = require('../package')
+
+module.exports = {
+    title: 'OpenCore Legacy Patcher',
+    head: [
+        ['meta', {
+            name: 'theme-color',
+            content: '#3eaf7c'
+        }],
+        ['meta', {
+            name: 'apple-mobile-web-app-capable',
+            content: 'yes'
+        }],
+        ['meta', {
+            name: 'apple-mobile-web-app-status-bar-style',
+            content: 'black'
+        }],
+        ["link", {
+            rel: "'stylesheet",
+            href: "/styles/website.css"
+        },]
+    ],
+    base: '/OpenCore-Legacy-Patcher/',
+
+	watch: {
+	    $page(newPage, oldPage) {
+	      if (newPage.key !== oldPage.key) {
+	        requestAnimationFrame(() => {
+	          if (this.$route.hash) {
+	            const element = document.getElementById(this.$route.hash.slice(1));
+
+	            if (element && element.scrollIntoView) {
+	              element.scrollIntoView();
+	            }
+	          }
+	        });
+	      }
+	    }
+	  },
+
+	markdown: {
+		extendMarkdown: md => {
+			md.use(require('markdown-it-multimd-table'), {
+				rowspan: true,
+			});
+		}
+	},
+
+    theme: 'vuepress-theme-succinct',
+    globalUIComponents: [
+        'ThemeManager'
+    ],
+
+    themeConfig: {
+        lastUpdated: true,
+        repo: 'https://github.com/dortania/OpenCore-Legacy-Patcher',
+		editLinks: true,
+		editLinkText: 'Help us improve this page!',
+        logo: 'homepage.png',
+
+        sidebar: [{
+            title: 'Introduction',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'START',
+				'MODELS',
+            ]
+
+        },
+        {
+            title: 'Setting up',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+                'INSTALLER',
+				'BUILD',
+            ]
+
+        },
+        {
+            title: 'Installation',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'BOOT',
+				'POST-INSTALL',
+            ]
+
+        },
+        {
+            title: 'Misc',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'TROUBLESHOOTING',
+				'UNINSTALL',
+            ]
+
+        },
+        ],
+    },
+    plugins: [
+        '@vuepress/plugin-back-to-top',
+        'vuepress-plugin-smooth-scroll',
+        ['vuepress-plugin-medium-zoom',
+            {
+                selector: "img",
+                options: {
+                    background: 'var(--bodyBgColor)'
+                }
+            }],
+    ]
+}

docs/.vuepress/styles/index.styl

@@ -0,0 +1,49 @@
+/**
+ * Custom Styles here.
+ *
+ * ref：https://v1.vuepress.vuejs.org/config/#index-styl
+ */
+
+[data-theme='light']
+ --sideBgColor $sideBgColor
+
+[data-theme='dark']
+ --sideBgColor $sideBgColorDark
+ --dropShadowColor $dropShadowColor
+
+.home .hero img
+  max-width 450px!important
+  
+.navbar
+  filter drop-shadow(0px 1px 1px var(--dropShadowColor))
+
+.sidebar
+  background-color var(--sideBgColor)
+
+div[class*="language-"]
+  pre, pre[class*="language-"]
+    margin-top 0
+
+html {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  background-color: unset;
+}
+::-webkit-scrollbar {
+    width 0px
+    background transparent /* make scrollbar transparent */
+}
+
+tr
+   &:nth-child(1n)
+     background-color var(--bodyBgColor)
+   &:nth-child(2n)
+     background-color var(--sideBgColor)
+
+	 
+
+.dropdown-wrapper .nav-dropdown
+  border 1px solid var(--sideBgColor)!important
+  background-color var(--sideBgColor)!important
+  box-shadow 0px 0px 2px var(--bodyBgColor)
+  right -12%!important

docs/.vuepress/styles/palette.styl

@@ -0,0 +1,23 @@
+/**
+ * Custom palette here.
+ *
+ * ref：https://v1.vuepress.vuejs.org/zh/config/#palette-styl
+ */
+
+$bodyFontSize = 16px
+$fallbackTheme = 'dark'
+$dropShadowColor = #111112
+
+// Light Theme
+$accentColor = #19b3e7
+$textColor = #2c3e50
+$bodyBgColor = #fff
+$sideBgColor = #fff
+$badgeTipColor = #caf2ff
+
+// Dark Theme
+$accentColorDark = #30BCD5
+$textColorDark = #ccc
+$bodyBgColorDark = #2d3033
+$sideBgColorDark = #363b40
+$badgeTipColorDark = #023e52

docs/BOOT.md

@@ -0,0 +1,20 @@
+# Booting OpenCore and macOS
+
+Now we finally get to boot OpenCore!
+
+Reboot machine while holding `Option` to select the EFI Boot entry with the OpenCore icon:
+
+* This will be the Mac Boot Picker
+
+![](../images/efi-boot.png)
+
+Now that you've loaded OpenCore, now select Install macOS!:
+
+* This will be the OpenCore Picker
+
+![](../images/oc-boot.png)
+
+
+After plenty of verbose booting, you will reach the installer screen! From there it's just like any normal macOS install.
+
+# Once installed and booting, head to [Post-Installation](./POST-INSTALL.md)

docs/BUILD.md

@@ -0,0 +1,37 @@
+# Building and installing OpenCore
+
+Now that we have a macOS installer, lets now build our OpenCore configuration!
+
+First Download the latest release: 
+
+* [OpenCore Legacy Patcher Releases](https://github.com/dortania/Opencore-Legacy-Patcher/releases)
+
+Next, run the `OpenCore-Patcher.app`:
+
+![](../images/first-run.png)
+
+From here you have a couple important options:
+
+* Build OpenCore
+* Install OpenCore to USB/internal drive
+* Change Model
+* Patcher Settings 
+
+If you're patching for a different machine than you're running, please select "Change Model" and enter the updated SMBIOS. For more advanced users, you may also tweak the patcher's build settings via "Patcher Settings"
+
+Now lets enter "Build OpenCore":
+
+![](../images/build-efi.png)
+
+The process should be quite quick to build, once finished you'll be plopped back to the main menu.
+
+Next lets run `Install OpenCore to USB/internal drive`:
+
+| Select Drive | Select EFI/FAT32 Partition |
+| :--- | :--- |
+| ![](../images/disk-start.png) | ![](../images/disk-efi.png) |
+
+  * If you have issues, please ensure you install OpenCore onto a FAT32 partition to ensure your Mac is able to boot it. You will need to format your drive as GUID/GPT in Disk Utility
+  
+
+# Once finished, head to [Booting OpenCore and macOS](./BOOT.md)

docs/INSTALLER.md

@@ -0,0 +1,53 @@
+# Download and build macOS Installers
+
+* [Downloading](#downloading)
+* [Building](#building)
+
+This doc is centered around downloading and writing the macOS installer to a USB. If you're already familiar with how to do this, you can skip.
+
+* Note: 16GB+ USB will be required for the installer
+
+## Downloading
+
+The simplest way to download macOS installs would be to use installinstallmacos:
+
+```sh
+mkdir ~/macOS-installer && cd ~/macOS-installer && curl -O https://raw.githubusercontent.com/munki/macadmin-scripts/main/installinstallmacos.py && sudo python installinstallmacos.py
+```
+
+![](../images/munki.png)
+
+As you can see, we get a nice list of macOS installers. If you need a particular versions of macOS, you can select it by typing the number next to it. For this example we'll choose 10:
+
+![](../images/munki-process.png)
+
+This is going to take a while as we're downloading the entire 12GB+ macOS installer.
+
+Once finished, you'll find in your `~/macOS-Installer/` folder a DMG containing the macOS Installer, called `Install_macOS_11.1-20C69.dmg` for example. Mount it and you'll find the installer application.
+
+* Note: We recommend to move the Install macOS.app into the `/Applications` folder, as we'll be executing commands from there.
+* Note 2: Running Cmd+Shift+G in Finder will allow you to easily jump to `~/macOS-installer`
+
+![](../images/munki-done-2.png)
+
+![](../images/munki-dmg.png)
+
+## Building
+
+Now we'll be formatting the USB to prep for both the macOS installer and OpenCore. We'll want to use macOS Extended (HFS+) with a GUID partition map(Using GUID is important for the patcher). This will create two partitions: the main `MyVolume` and a second called `EFI` which is used as a boot partition where your Mac's firmware will check for boot files.
+
+* Note: By default, Disk Utility only shows partitions – press Cmd/Win+2 to show all devices (alternatively you can press the View button)
+
+![Formatting the USB](../images/format-usb.png)
+
+Next run the `createinstallmedia` command provided by [Apple](https://support.apple.com/en-us/HT201372). Note that the command is made for USB's formatted with the name `MyVolume`:
+
+```sh
+sudo /Applications/Install\ macOS\ Big\ Sur.app/Contents/Resources/createinstallmedia --volume /Volumes/MyVolume
+```
+
+* Note: You can also replace the `createinstallmedia` path with that of where your installer's located (same idea with the drive name).
+
+![](../images/createinstallmedia.png)
+
+# Once finished, head to [Building and installing OpenCore](./BUILD.md)

docs/MODELS.md

@@ -122,4 +122,6 @@ The below table will list all supported and unsupported functions of the patcher
 | :--- | :--- | :--- | :--- |
 | Xserve1,1 | Mid-2006 | <span style="color:red"> NO </span> | 32-Bit Firmware limitation |
 | Xserve2,1 | Early 2008 | ^^ | ^^ |
-| Xserve3,1 | Early 2009 | <span style="color:#30BCD5"> YES </span> | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
+| Xserve3,1 | Early 2009 | <span style="color:#30BCD5"> YES </span> | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
+
+# Once you've verified your hardware is supported, head to [Download and build macOS Installers](./INSTALLER.md)

docs/POST-INSTALL.md

@@ -0,0 +1,29 @@
+# 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 without USB drive
+
+Once you've installed macOS through OpenCore, you can boot up and go through the regular install process. To boot without the USB drive plugged in is quite simple:
+
+* Download OpenCore Legacy Patcher
+* Change Patcher settings as you'd like
+* Build OpenCore again
+* Install OpenCore to internal drive
+* Reboot holding Option, and select the internal EFI
+
+And voila! No more USB drive required
+
+## Booting seamlessly without Verbose or OpenCore Picker
+
+To do this, run the OpenCore Patcher and head to Patcher Settings:
+
+![](../images/settings.png)
+
+Here you can change different patcher settings, however the main 2 of interest are:
+
+* Enable Verbose Mode
+* Set ShowPicker Mode
+
+Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show OpenCore picker, you can simply press "Esc" key repeatedly.

docs/README.md

@@ -0,0 +1,20 @@
+---
+home: true
+heroImage: /homepage.png
+heroText: OpenCore Legacy Patcher
+actionText: Getting Started→
+actionLink: START.md
+
+meta:
+- name: description
+  content: Experience macOS just like before
+
+features:
+- title: Built with security in mind
+  details: Supporting System Integrity Protection(SIP), FileVault 2, .im4m Secure Boot and Vaulting. You're just as secure as a supported Mac
+- title: Native OTA updates
+  details: Install updates the moment the come out just like on a supported Mac, and no more 12GB+ updates.
+- title: Zero firmware patching
+  details: No need to patch APFS ROM support, all protocol upgrades are done in memory and never permanent.
+footer: Copyright © Dortania 2020-2021
+---

docs/START.md

@@ -0,0 +1,19 @@
+# What is OpenCore?
+
+This is a sophisticated boot loader used to inject and patch data in memory, instead of on disk. This means we're able to get near-native experience on many unsupported Macs with Metal GPUs. This includes many of the long desired features of other patchers such as:
+
+* System Integrity Protection, FileVault 2, .im4m Secure Boot and Vaulting
+* Native OTA OS DELTA updates on all Macs
+* Recovery OS, Safe Mode and Single-user Mode booting
+
+While many PC users from the Hackintosh community are familiar with OpenCore, OpenCore was designed as Mac and PC agnostic ensuring both platforms can use it easily. And with OpenCore Legacy Patcher, we help automate the process making running with OpenCore that much easier.
+
+## How do I get started?
+
+1. The first step of ensuring whether your model is support is checking here:
+
+* [Supported Models](./MODELS.md)
+
+2. [Download and build macOS Installer](./INSTALLER.md)
+3. [Run the `OpenCore-Patcher.app`](./BUILD.md)
+4. [Reboot and boot OpenCore](./BOOT.md)

docs/TROUBLESHOOTING.md

@@ -7,6 +7,7 @@ Here are some common errors users may experience while using this patcher:
 * [Infinite Recovery OS Booting](#infinite-recovery-os-reboot)
 * [Reboot when entering Hibernation (`Sleep Wake Failure`)](#reboot-when-entering-hibernation-sleep-wake-failure)
 * [Booting with a non-flashed GPU](#booting-with-a-non-flashed-gpu)
+* [How to Boot Big Sur Recovery](#how-to-boot-big-sur-recovery)
 
 ## Stuck on `This version of Mac OS X is not supported on this platform`
 
@@ -16,7 +17,7 @@ Once you've booted OpenCore at least once, your hardware should now auto boot it
 
 ## Cannot boot macOS without the USB
 
-At this time, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again but select your internal drive.
+By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again but select your internal drive.
 
 Reminder that once this is done, you'll need to select OpenCore in the boot picker again for your hardware to remember this entry and auto boot from then on.
 
@@ -28,7 +29,11 @@ With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates
 
 ## Reboot when entering Hibernation (`Sleep Wake Failure`)
 
-Resolved in OpenCore-Legacy-Patcher v0.0.14
+[Known issue on some models](https://github.com/dortania/Opencore-Legacy-Patcher/issues/72), temporary fix is to disable Hibernation:
+
+```
+sudo pmset -a hibernatemode 0
+```
 
 ## Booting with a non-flashed GPU
 
@@ -41,4 +46,8 @@ sudo bless --verbose --file /Volumes/VOLNAME/EFI/OC/OpenCore.efi --folder /Volum
 * Note you will need to replace `VOLNAME` with the Volume name of your USB or hard drive with OpenCore
 * Note 2: Once done, you can re-enable SIP
 
-Once you boot OpenCore for the first time, LauncherOption will install itself as the top boot priority making OpenCore always launch. Combined with `RequestBootVar`, all boot options must go through OpenCore ensuring seamless usage even with OS installation and updates.
+Once you boot OpenCore for the first time, LauncherOption will install itself as the top boot priority making OpenCore always launch. Combined with `RequestBootVar`, all boot options must go through OpenCore ensuring seamless usage even with OS installation and updates.
+
+## How to Boot Big Sur Recovery
+
+By default, the patcher will try to hide extra boot options such as recovery from the user. To make them appear, simply press the "Spacebar" inside OpenCore's Picker to list all boot options.

docs/UNINSTALL.md

@@ -0,0 +1,11 @@
+# Uninstalling OpenCore
+
+To remove OpenCore is actually quite simply:
+
+1. Remove OpenCore either from the USB or internal drive
+  * You'll need to mount the drive's EFI partition, and delete the EFI folder
+  * [See here for example how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
+2. Reset NVRAM
+  * [Reset NVRAM or PRAM on your Mac](https://support.apple.com/HT204063)
+
+Know that if you are on Big Sur when you remove the EFI folder, your Mac will no longer boot and show the prohibited symbol. Be ready to install an older version of macOS before you uninstall OpenCore.

docs/package.json

@@ -0,0 +1,51 @@
+{
+   "name": "OpenCore-Legacy-Patcher",
+   "version": "0.0.1",
+   "description": "Guide to put macOS on unsupported devices",
+   "main": "",
+   "author": {
+      "name": "Dortania",
+      "url": "https://github.com/dortania"
+   },
+   "repository": {
+      "type": "git",
+      "url": "git+https://github.com/dortania/OpenCore-Legacy-Patcher.git"
+   },
+   "scripts": {
+      "dev": "vuepress dev",
+      "build": "vuepress build",
+      "fix-lint": "run-script-os",
+      "fix-lint:default": "(echo Attempting to fix lint... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' -f && echo Fixed successfully, please commit.) || (echo Fix failed! && exit 1)",
+      "fix-lint:win32": "(echo Attempting to fix lint... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md -f && echo Fixed successfully, please commit.) || (echo Fix failed! && exit 1)",
+      "lint": "run-script-os",
+      "lint:default": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' && echo Lint passed.) || (echo Lint failed! Please review and fix errors. && exit 1)",
+      "lint:win32": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md && echo Lint passed.) || (echo Lint failed! Please review and fix errors. && exit 1)",
+      "lint-ci": "run-script-os",
+      "lint-ci:default": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' && echo Lint passed.) || ((echo Lint failed, attempting fix... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' -f && echo Fix generated successfully. Please apply the following diff using git apply && git diff) || echo Fix failed! && exit 1)",
+      "lint-ci:win32": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md && echo Lint passed.) || ((echo Lint failed, attempting fix... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md -f && echo Fix generated successfully. Please apply the following diff using git apply && git diff) || echo Fix failed! && exit 1)",
+      "sort-dict": "node ./scripts/sortDict.js",
+      "spellcheck": "run-script-os",
+      "spellcheck:default": "(spellchecker --plugins spell indefinite-article repeated-words syntax-urls --dictionaries dictionary/dictionary.txt dictionary/opencorekeys.txt --files '**/*.md'  && echo Spellcheck passed.) || (echo Spellcheck failed! Please review and fix errors/add words to dictionary as needed. && exit 1)",
+      "spellcheck:win32": "(spellchecker --plugins spell indefinite-article repeated-words syntax-urls --dictionaries dictionary/dictionary.txt dictionary/opencorekeys.txt --files **/*.md  && echo Spellcheck passed.) || (echo Spellcheck failed! Please review and fix errors/add words to dictionary as needed. && exit 1)",
+      "test": "run-script-os",
+      "test:default": "npm run lint --silent; npm run spellcheck --silent",
+      "test:win32": "npm run lint --silent & npm run spellcheck --silent"
+   },
+   "license": "CC-BY-NC-SA-4.0",
+   "devDependencies": {
+      "@vuepress/plugin-back-to-top": "^1.7.1",
+      "markdown-it-multimd-table": "^4.0.3",
+      "markdown-link-check": "^3.8.5",
+      "markdownlint-cli": "^0.26.0",
+      "run-script-os": "^1.1.4",
+      "spellchecker-cli": "^4.4.0",
+      "vuepress": "^1.7.1",
+      "vuepress-plugin-medium-zoom": "^1.1.9",
+      "vuepress-plugin-zooming": "^1.1.8",
+      "vuepress-theme-book": "0.0.5",
+      "vuepress-theme-dark-new": "^0.1.2",
+      "vuepress-theme-succinct": "^1.6.4",
+      "vuepress-theme-yuu": "^2.3.0"
+   },
+   "homepage": "https://dortania.github.io/OpenCore-Legacy-Patcher/"
+}

docs/scripts/linkcheck.py

@@ -0,0 +1,9 @@
+from pathlib import Path
+import subprocess
+
+for i in [i for i in list(Path().resolve().glob("**/*.md")) if "node_modules" not in str(i.parent) and "_book" not in str(i.parent)]:
+    #bert = subprocess.run(['npx', 'markdown-link-check', '"' + str(i) + '"', '-c', '.markdownlinkcheck.json'], capture_output=True, shell=True, cwd=Path().resolve())    
+    bert = subprocess.run('npx markdown-link-check "' + str(i) + '"', stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=Path().resolve())
+    outpot = bert.stdout.decode().replace("\r", "").split("\n")
+    outpot = [i for i in outpot if ("FILE: " in i or " → Status: " in i) and " → Status: 429" not in i]
+    [print(i) for i in outpot]

docs/scripts/sortDict.js

@@ -0,0 +1,26 @@
+const fs = require("fs");
+
+process.chdir(__dirname);
+
+console.log("Reading dictionary.txt");
+let dictionary = fs.readFileSync("../dictionary/dictionary.txt", { encoding: "UTF8" })
+                    .replace("\r", "").split("\n");
+
+let ocDictionary = fs.readFileSync("../dictionary/opencorekeys.txt", { encoding: "UTF8" })
+                     .replace("\r", "").split("\n");
+
+dictionary = dictionary.filter(string => string != "");
+ocDictionary = ocDictionary.filter(string => string != "");
+
+dictionary = dictionary.filter((string, index) => dictionary.indexOf(string) == index);
+ocDictionary = ocDictionary.filter((string, index) => ocDictionary.indexOf(string) == index);
+
+dictionary = dictionary.filter(string => !ocDictionary.includes(string));
+
+console.log("Sorting...");
+dictionary.sort();
+ocDictionary.sort();
+
+console.log("Writing dictionary.txt");
+fs.writeFileSync("../dictionary/dictionary.txt", dictionary.join("\n"));
+fs.writeFileSync("../dictionary/opencorekeys.txt", ocDictionary.join("\n"));

payloads/Config/v0.6.8/config.plist

@@ -818,6 +818,8 @@
 			<dict>
 				<key>rtc-blacklist</key>
 				<data></data>
+				<key>OCLP-Version</key>
+				<string></string>
 			</dict>
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
 			<dict>
@@ -841,6 +843,7 @@
 			<key>4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102</key>
 			<array>
 				<string>rtc-blacklist</string>
+				<string>OCLP-Version</string>
 			</array>
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
 			<array>
@@ -930,7 +933,7 @@
 			<key>ProcessorType</key>
 			<integer>0</integer>
 			<key>ROM</key>
-			<data>ESIzRFVm</data>
+			<data></data>
 			<key>SpoofVendor</key>
 			<true/>
 			<key>SystemProductName</key>
@@ -1140,7 +1143,7 @@
 			<key>AppleSmcIo</key>
 			<false/>
 			<key>AppleUserInterfaceTheme</key>
-			<false/>
+			<true/>
 			<key>DataHub</key>
 			<false/>
 			<key>DeviceProperties</key>

payloads/Kexts/Maps/Universal/Info.plist

@@ -10470,7 +10470,7 @@
 			<key>board-id</key>
 			<string>Mac-7BA5B2D9E42DDD94</string>
 		</dict>
-		<key>iMacProMax1,1</key>
+		<key>Dortania1,1</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -10600,7 +10600,7 @@
 				</dict>
 			</dict>
 			<key>model</key>
-			<string>iXacProMax1,1</string>
+			<string>Xortania1,1</string>
 		</dict>
 	</dict>
 	<key>OSBundleRequired</key>

payloads/Tools/CreateVault/create_vault.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+#  create_vault.sh
+#
+#
+#  Created by Rodion Shingarev on 13.04.19.
+#
+OCPath="$1"
+
+if [ "${OCPath}" = "" ]; then
+  echo "Usage ./create_vault.sh path/to/EFI/OC"
+  exit 1
+fi
+
+if [ ! -d "${OCPath}" ]; then
+  echo "Path $OCPath is missing!"
+  exit 1
+fi
+
+if [ ! -x /usr/bin/find ] || [ ! -x /bin/rm ] || [ ! -x /usr/bin/sed ] || [ ! -x /usr/bin/xxd ]; then
+  echo "Unix environment is broken!"
+  exit 1
+fi
+
+if [ ! -x /usr/libexec/PlistBuddy ]; then
+  echo "PlistBuddy is missing!"
+  exit 1
+fi
+
+if [ ! -x /usr/bin/shasum ]; then
+  echo "shasum is missing!"
+  exit 1
+fi
+
+abort() {
+  /bin/rm -rf vault.plist vault.sig /tmp/vault_hash
+  echo "Fatal error: ${1}!"
+  exit 1
+}
+
+echo "Chose ${OCPath} for hashing..."
+
+cd "${OCPath}" || abort "Failed to reach ${OCPath}"
+/bin/rm -rf vault.plist vault.sig || abort "Failed to cleanup"
+/usr/libexec/PlistBuddy -c "Add Version integer 1" vault.plist || abort "Failed to set vault.plist version"
+
+echo "Hashing files in ${OCPath}..."
+
+/usr/bin/find . -not -path '*/\.*' -type f \
+  \( ! -iname ".*" \) \
+  \( ! -iname "vault.*" \) \
+  \( ! -iname "OpenCore.efi" \) | while read -r fname; do
+  fname="${fname#"./"}"
+  wname="${fname//\//\\\\}"
+  shasum=$(/usr/bin/shasum -a 256 "${fname}") || abort "Failed to hash ${fname}"
+  sha=$(echo "$shasum" | /usr/bin/sed 's/^\([a-f0-9]\{64\}\).*/\1/') || abort "Illegit hashsum"
+  if [ "${#sha}" != 64 ] || [ "$(echo "$sha"| /usr/bin/sed 's/^[a-f0-9]*$//')" ]; then
+    abort "Got invalid hash: ${sha}!"
+  fi
+
+  echo "${wname}: ${sha}"
+
+  echo "${sha}" | /usr/bin/xxd -r -p > /tmp/vault_hash || abort "Hashing failure"
+  /usr/libexec/PlistBuddy -c "Import Files:'${wname}' /tmp/vault_hash" vault.plist || abort "Failed to append vault.plist!"
+done
+
+/bin/rm -rf /tmp/vault_hash
+
+echo "All done!"
+exit 0

payloads/Tools/CreateVault/sign.command

@@ -0,0 +1,88 @@
+#!/bin/sh
+
+abort() {
+  echo "Fatal error: ${1}!"
+  exit 1
+}
+
+cleanup() {
+  echo "Cleaning up keys"
+  rm -rf "${KeyPath}"
+}
+
+if [ ! -x /usr/bin/dirname ] || [ ! -x /bin/chmod ] || [ ! -x /bin/mkdir ] || [ ! -x /usr/bin/openssl ] || [ ! -x /bin/rm ] || [ ! -x /usr/bin/strings ] || [ ! -x /usr/bin/grep ] || [ ! -x /usr/bin/cut ] || [ ! -x /bin/dd ] || [ ! -x /usr/bin/uuidgen ] ; then
+  abort "Unix environment is broken!"
+fi
+
+cd "$(/usr/bin/dirname "$0")" || abort "Failed to enter working directory!"
+
+OCPath="$1"
+
+if [ "$OCPath" = "" ]; then
+  OCPath=../../EFI/OC
+fi
+
+KeyPath="/tmp/Keys-$(/usr/bin/uuidgen)"
+OCBin="${OCPath}/OpenCore.efi"
+RootCA="${KeyPath}/ca.pem"
+PrivKey="${KeyPath}/privatekey.cer"
+PubKey="${KeyPath}/vault.pub"
+
+if [ ! -d "${OCPath}" ]; then
+  abort "Path ${OCPath} is missing!"
+fi
+
+if [ ! -f "${OCBin}" ]; then
+  abort "OpenCore.efi is missing!"
+fi
+
+if [ ! -x ./RsaTool ] || [ ! -x ./create_vault.sh ]; then
+  if [ -f ./RsaTool ]; then
+    /bin/chmod a+x ./RsaTool || abort "Failed to set permission for RsaTool"
+  else
+    abort "Failed to find RsaTool!"
+  fi
+
+  if [ -f ./create_vault.sh ]; then
+    /bin/chmod a+x ./create_vault.sh || abort "Failed to set permission for create_vault.sh"
+  else
+    abort "Failed to find create_vault.sh!"
+  fi
+fi
+
+trap cleanup EXIT INT TERM
+
+if [ ! -d "${KeyPath}" ]; then
+  /bin/mkdir -p "${KeyPath}" || abort "Failed to create path ${KeyPath}"
+fi
+
+./create_vault.sh "${OCPath}" || abort "create_vault.sh returns errors!"
+
+if [ ! -f "${RootCA}" ]; then
+  /usr/bin/openssl genrsa -out "${RootCA}" 2048 || abort "Failed to generate CA"
+  if [ -f "${PrivKey}" ]; then
+    echo "WARNING: Private key exists without CA"
+  fi
+fi
+
+/bin/rm -fP "${PrivKey}" || abort "Failed to remove ${PrivKey}"
+echo "Issuing a new private key..."
+/usr/bin/openssl req -new -x509 -key "${RootCA}" -out "${PrivKey}" -days 1825 -subj "/C=WO/L=127.0.0.1/O=Acidanthera/OU=Acidanthera OpenCore/CN=Greetings from Acidanthera and WWHC" || abort "Failed to issue private key!"
+
+/bin/rm -fP "${PubKey}" || abort "Failed to remove ${PubKey}"
+echo "Getting public key based off private key..."
+./RsaTool -cert "${PrivKey}" > "${PubKey}" || abort "Failed to get public key"
+
+echo "Signing ${OCBin}..."
+./RsaTool -sign "${OCPath}/vault.plist" "${OCPath}/vault.sig" "${PubKey}" || abort "Failed to patch ${PubKey}"
+
+echo "Bin-patching ${OCBin}..."
+off=$(($(/usr/bin/strings -a -t d "${OCBin}" | /usr/bin/grep "=BEGIN OC VAULT=" | /usr/bin/cut -f1 -d' ') + 16))
+if [ "${off}" -le 16 ]; then
+  abort "${OCBin} is borked"
+fi
+
+/bin/dd of="${OCBin}" if="${PubKey}" bs=1 seek="${off}" count=528 conv=notrunc || abort "Failed to bin-patch ${OCBin}"
+
+echo "All done!"
+exit 0