From 2fd02f6794e20b3714d03372f02896435ede1f91 Mon Sep 17 00:00:00 2001 From: Dhinak G <17605561+dhinakg@users.noreply.github.com> Date: Thu, 4 Mar 2021 09:08:04 -0500 Subject: [PATCH] Fix WiFi patch logic --- Resources/build.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/build.py b/Resources/build.py index dcd0713e5..dd5269758 100644 --- a/Resources/build.py +++ b/Resources/build.py @@ -92,11 +92,10 @@ class BuildOpenCore: self.enable_kext(name, version, path, check) # WiFi patches - wifi_devices = plistlib.loads(subprocess.run(f"ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()) + 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")] - wifi_devices = wifi_devices[0] - if (self.constants.custom_model == "None") & (self.hexswap(binascii.hexlify(wifi_devices["vendor-id"]).decode()[:4]) in ModelArray.nativeWifi): - print("- Skipping wifi patches") + if 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") else: if self.model in ModelArray.WifiAtheros: self.enable_kext("IO80211HighSierra.kext", self.constants.io80211high_sierra_version, self.constants.io80211high_sierra_path)