From c1258ac50db913fd9b5bb7ed322b989dc841f2b2 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Mon, 30 May 2022 11:18:28 -0600 Subject: [PATCH] sys_patch.py: Adjust `delete_nonmetal_enforcement()` logic --- resources/sys_patch.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/sys_patch.py b/resources/sys_patch.py index 9ca0ef8ab..4f564e927 100644 --- a/resources/sys_patch.py +++ b/resources/sys_patch.py @@ -196,12 +196,11 @@ class PatchSysVolume: utilities.process_status(utilities.elevated(["mkdir", "-p", f"{self.mount_application_support}/SkyLightPlugins/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)) def delete_nonmetal_enforcement(self): - use_metal = subprocess.run(["defaults", "read", "/Library/Preferences/com.apple.CoreDisplay", "useMetal"], stdout=subprocess.PIPE).stdout.decode("utf-8").strip() - use_iop = subprocess.run(["defaults", "read", "/Library/Preferences/com.apple.CoreDisplay", "useIOP"], stdout=subprocess.PIPE).stdout.decode("utf-8").strip() - if use_metal or use_iop in ["0", "false", "1", "true"]: - print("- Removing non-Metal Enforcement Preferences") - utilities.elevated(["defaults", "delete", "/Library/Preferences/com.apple.CoreDisplay", "useMetal"]) - utilities.elevated(["defaults", "delete", "/Library/Preferences/com.apple.CoreDisplay", "useIOP"]) + for arg in ["useMetal", "useIOP"]: + result = subprocess.run(["defaults", "read", "/Library/Preferences/com.apple.CoreDisplay", arg], stdout=subprocess.PIPE).stdout.decode("utf-8").strip() + if result in ["0", "false", "1", "true"]: + print(f"- Removing non-Metal Enforcement Preference: {arg}") + utilities.elevated(["defaults", "delete", "/Library/Preferences/com.apple.CoreDisplay", arg]) def write_patchset(self, patchset): destination_path = f"{self.mount_location}/System/Library/CoreServices"