From cf46a88a44da085eac47e869b83d4032561f7561 Mon Sep 17 00:00:00 2001
From: bestplay9384 <bestplay9@me.com>
Date: Sat, 10 Feb 2024 16:49:42 +0100
Subject: [PATCH] Mac OS Sonoma 14.3.1 update && fixed typo in RestrictEvents
 kext NVRAM flag revpatch => now incremental OS updates should work fine after
 reverting OCLP root patches (if were enabled)

---
 EFI/OC/config.plist |  2 +-
 README.md           |  6 +++--
 _/scripts/apply.sh  |  8 -------
 _/scripts/remove.sh |  7 ------
 _/scripts/run.sh    | 54 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 18 deletions(-)
 delete mode 100644 _/scripts/apply.sh
 delete mode 100644 _/scripts/remove.sh
 create mode 100644 _/scripts/run.sh

diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist
index 251b824..5d17062 100755
--- a/EFI/OC/config.plist
+++ b/EFI/OC/config.plist
@@ -1011,7 +1011,7 @@
 				Rg==
 				</data>
 				<key>boot-args</key>
-				<string>keepsyms=1 debug=0x100 agdpmod=pikera -wegnoigpu -ctssmt -revpatch=sbvmm</string>
+				<string>keepsyms=1 debug=0x100 agdpmod=pikera -wegnoigpu -ctssmt revpatch=sbvmm</string>
 				<key>csr-active-config</key>
 				<data>
 				AwgAAA==
diff --git a/README.md b/README.md
index 5d7ffc7..715e46c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Gigabyte Z690 Gaming X DDR4 + i7 12700K + RX 5700 XT
 
 ## Last Updated Configuration Summary
-- Mac OS Sonoma 14.3
+- Mac OS Sonoma 14.3.1
 - OpenCore: 0.9.8
 
 ## Hardware Specification
@@ -25,7 +25,9 @@
 - `agdpmod=pikera` for AMD dGPU
 - [PlatformInfo](https://dortania.github.io/OpenCore-Install-Guide/config.plist/comet-lake.html#platforminfo)
     1. Copy `_/scripts/platformInfo.dist` file to `_scripts/platformInfo` and fullfill platformInfo parameters inside this file
-    2. Use `sh _/scripts/apply.sh` command to apply Your values to config.plist
+    2. Then:
+        1. To APPLY parameters to config.plist use command: `sh _/scripts/run.sh --apply`
+        2. To REVERT parameters from config.plist use command: `sh _/scripts/run.sh --revert`
     3. You can also use OpenCore Configurator to generate & fill automatically OR use GenSMBIOS to generate only
     4. Remember to use correct SMBIOS Type when generating
     5. Scripts are included for faster cleaning unnecessary parameters on my end
diff --git a/_/scripts/apply.sh b/_/scripts/apply.sh
deleted file mode 100644
index 208f257..0000000
--- a/_/scripts/apply.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-DIR_PREFIX=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-source ${DIR_PREFIX}/platformInfo
-
-plutil -replace PlatformInfo.Generic.MLB -string ${MLB} ${DIR_PREFIX}/../../EFI/OC/config.plist
-plutil -replace PlatformInfo.Generic.ROM -data ${ROM} ${DIR_PREFIX}/../../EFI/OC/config.plist
-plutil -replace PlatformInfo.Generic.SystemSerialNumber -string ${SystemSerialNumber} ${DIR_PREFIX}/../../EFI/OC/config.plist
-plutil -replace PlatformInfo.Generic.SystemUUID -string ${SystemUUID} ${DIR_PREFIX}/../../EFI/OC/config.plist
\ No newline at end of file
diff --git a/_/scripts/remove.sh b/_/scripts/remove.sh
deleted file mode 100644
index 69691f9..0000000
--- a/_/scripts/remove.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-DIR_PREFIX=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-
-plutil -replace PlatformInfo.Generic.MLB -string "[REPLACE]" ${DIR_PREFIX}/../../EFI/OC/config.plist
-plutil -replace PlatformInfo.Generic.ROM -string "[REPLACE]" ${DIR_PREFIX}/../../EFI/OC/config.plist
-plutil -replace PlatformInfo.Generic.SystemSerialNumber -string "[REPLACE]" ${DIR_PREFIX}/../../EFI/OC/config.plist
-plutil -replace PlatformInfo.Generic.SystemUUID -string "[REPLACE]" ${DIR_PREFIX}/../../EFI/OC/config.plist
\ No newline at end of file
diff --git a/_/scripts/run.sh b/_/scripts/run.sh
new file mode 100644
index 0000000..93e241e
--- /dev/null
+++ b/_/scripts/run.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+DIR_PREFIX=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+CONFIG_FILE="${DIR_PREFIX}/../../EFI/OC/config.plist"
+VARIABLES_FILE="${DIR_PREFIX}/platformInfo"
+
+ensure_file_exists() {
+    if [ ! -e $1 ]; then
+        echo "File '$1' not found!"
+
+        exit 1
+    fi
+}
+
+apply_plutil_value() {
+    plutil -replace "$1" "-$2" "$3" $CONFIG_FILE && echo "$1: $3 ($2)"
+}
+
+ensure_file_exists $CONFIG_FILE
+ensure_file_exists $VARIABLES_FILE
+
+source $VARIABLES_FILE
+
+case "$1" in
+        --apply) 
+            apply_plutil_value "PlatformInfo.Generic.MLB" "string" $MLB
+            apply_plutil_value "PlatformInfo.Generic.ROM" "data" $ROM
+            apply_plutil_value "PlatformInfo.Generic.SystemSerialNumber" "string" $SystemSerialNumber
+            apply_plutil_value "PlatformInfo.Generic.SystemUUID" "string" $SystemUUID
+
+            echo "APPLIED!"
+
+            exit 0
+            ;;
+        --revert) 
+            apply_plutil_value "PlatformInfo.Generic.MLB" "string" "[REPLACE]"
+            apply_plutil_value "PlatformInfo.Generic.ROM" "string" "[REPLACE]"
+            apply_plutil_value "PlatformInfo.Generic.SystemSerialNumber" "string" "[REPLACE]"
+            apply_plutil_value "PlatformInfo.Generic.SystemUUID" "string" "[REPLACE]"
+
+            echo "REVERTED!"
+
+            exit 0
+            ;;
+        *)
+            echo "Nothing to do."
+
+            exit 0
+            ;;
+    esac
+exit 0
+
+
+
+