Merge pull request #1018 from dortania/skip-hibernation

build: Skip OC Picker on Hibernation Wake

CHANGELOG.md

@@ -26,7 +26,7 @@
   - CryptexFixup 1.0.1 - release
   - DebugEnhancer 1.0.7 - release
   - FeatureUnlock 1.1.0 - release
-  - OpenCorePkg 0.8.6 - release
+  - OpenCorePkg 0.8.7 - rolling (5061093)
   - RestrictEvents 1.0.9 - release
   - WhateverGreen 1.6.1 - release
 

payloads/Config/config.plist

@@ -1994,7 +1994,7 @@
 			<key>PollAppleHotKeys</key>
 			<true/>
 			<key>ShowPicker</key>
-			<true/>
+			<string>SkipOnHibernateWake</string>
 			<key>TakeoffDelay</key>
 			<integer>0</integer>
 			<key>Timeout</key>

resources/build/misc.py

@@ -1,7 +1,7 @@
 # Class for handling Misc Patches, invocation from build.py
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
-from resources import constants, device_probe, generate_smbios
+from resources import constants, device_probe, generate_smbios, utilities
 from resources.build import support
 from data import model_array, smbios_data, cpu_data
 
@@ -216,18 +216,15 @@ class build_misc:
         support.build_support(self.model, self.constants, self.config).get_efi_binary_by_path("OpenLinuxBoot.efi", "UEFI", "Drivers")["Enabled"] = True
         support.build_support(self.model, self.constants, self.config).get_efi_binary_by_path("ResetNvramEntry.efi", "UEFI", "Drivers")["Enabled"] = True
 
-        if self.constants.showpicker is True:
+        if self.constants.showpicker is False:
-            print("- Enabling ShowPicker")
-            self.config["Misc"]["Boot"]["ShowPicker"] = True
-        else:
             print("- Hiding OpenCore picker")
-            self.config["Misc"]["Boot"]["ShowPicker"] = False
+            self.config["Misc"]["Boot"]["ShowPicker"] = "Hide"
 
         if self.constants.oc_timeout != 5:
             print(f"- Setting custom OpenCore picker timeout to {self.constants.oc_timeout} seconds")
             self.config["Misc"]["Boot"]["Timeout"] = self.constants.oc_timeout
 
-        if self.constants.vault is True:
+        if self.constants.vault is True and utilities.check_command_line_tools() is True:
             print("- Setting Vault configuration")
             self.config["Misc"]["Security"]["Vault"] = "Secure"
             support.build_support(self.model, self.constants, self.config).get_efi_binary_by_path("OpenShell.efi", "Misc", "Tools")["Enabled"] = False

resources/constants.py

@@ -26,8 +26,8 @@ class Constants:
 
         # OpenCore Versioning
         # https://github.com/acidanthera/OpenCorePkg
-        self.opencore_commit = "68a4ed5 - 11-07-2022"
+        self.opencore_commit = "5061093 - 11-16-2022"
-        self.opencore_version = "0.8.6"
+        self.opencore_version = "0.8.7"
 
         # Kext Versioning
         ## Acidanthera