Add better error messaging

Fixes #304

CHANGELOG.md

@@ -1,5 +1,8 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.1.9
+- Fix incorrect AMFI and SIP detection
+
 ## 0.1.8
 - Fix Kernel Panic in Big Sur and Monterey
 - Increment binaries:

OpenCore-Patcher.command

@@ -26,7 +26,7 @@ class OpenCoreLegacyPatcher():
                 self.constants.custom_cpu_model = 1
                 self.constants.custom_cpu_model_value = custom_cpu_model_value.split("%00")[0]
 
-        if "-v" in Utilities.get_nvram("boot-args", decode=False):
+        if "-v" in (Utilities.get_nvram("boot-args", decode=False) or ""):
             self.constants.verbose_debug = True
 
         # Check if running in RecoveryOS
@@ -42,6 +42,10 @@ class OpenCoreLegacyPatcher():
                     self.constants.sip_status = True
                     self.constants.secure_status = False
                     self.constants.disable_amfi = False
+                else:
+                    self.constants.sip_status = False
+                    self.constants.secure_status = False
+                    self.constants.disable_amfi = True
             else:
                 self.constants.sip_status = False
                 self.constants.secure_status = False

Resources/Constants.py

@@ -9,7 +9,7 @@ from pathlib import Path
 
 class Constants:
     def __init__(self):
-        self.patcher_version = "0.1.8"
+        self.patcher_version = "0.1.9"
         self.opencore_commit = "4e0ff2d - 05-23-2021"
         self.opencore_version = "0.7.0"
         self.lilu_version = "1.5.4"

Resources/SysPatch.py

@@ -435,6 +435,8 @@ class PatchSysVolume:
             else:
                 sip = self.constants.root_patch_sip_mojave
             print("\n".join(sip))
+            print("For Hackintoshes, please set csr-active-config to 030A0000 (0xA03)")
+            print("For non-OpenCore Macs, please run 'csrutil disable' and \n'csrutil authenticated-root disable' in RecoveryOS")
         if self.sbm_enabled is True:
             print("\nCannot patch!!! Please disable SecureBootModel!!!")
             print("Disable SecureBootModel in Patcher Settings and Rebuild OpenCore")

Resources/Utilities.py

@@ -94,12 +94,13 @@ def get_nvram(variable: str, uuid: str = None, *, decode: bool = False):
     else:
         uuid = ""
     result = subprocess.run(f"nvram -x {uuid}{variable}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip()
-    if result:
+    try:
         value = plistlib.loads(result)[f"{uuid}{variable}"]
-        if decode:
-            value = value.strip(b"\0").decode()
-        return value
-    return None
+    except plistlib.InvalidFileException:
+        return None
+    if decode:
+        value = value.strip(b"\0").decode()
+    return value
 
 # def menu(title, prompt, menu_options, add_quit=True, auto_number=False, in_between=[], top_level=False):
 #     return_option = ["Q", "Quit", None] if top_level else ["B", "Back", None]