Fix SROS ver check

Wrong version types...

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

src/main.py

@@ -849,7 +849,7 @@ def main(self):
 
             hz = self.sysinfo.get_refresh_rate()
 
-            if split_ver(self.sysinfo.sros_full_ver) < split_ver(BUGGY_SFR_MIN):
+            if split_ver(self.sysinfo.sros_ver) < split_ver(BUGGY_SFR_MIN):
                 p_error("Mismatched System Firmware / System Recovery detected!")
                 print()
                 p_warning("You have a machine with a ProMotion display, with a System Firmware version")
@@ -880,6 +880,9 @@ def main(self):
                     p_warning("DO NOT CHANGE THIS TO ANY OTHER MODE. Doing so would make your System RecoveryOS")
                     p_warning("stop working, which is a very dangerous situation. This is a critical Apple bug.")
                     print()
+                    p_warning("Please update to the next version of macOS as soon as it is available, which")
+                    p_warning("should roll forward to the next System RecoveryOS version and clear the danger.")
+                    print()
                 p_warning("You may continue the install, but you MUST NOT change the refresh rate until")
                 p_warning("Apple fixes this bug. Doing so would break your system. Proceed at your own")
                 p_warning("risk.")

src/system.py

@@ -83,6 +83,8 @@ def fetch(self):
                     self.login_user = consoleuser
 
         self.sros_full_ver = "0"
+        self.sros_ver = None
+        self.sros_build = None
 
         base = "/System/Volumes/iSCPreboot/SystemRecovery"
         for p in os.listdir(base):
@@ -92,6 +94,7 @@ def fetch(self):
                 continue
             if split_ver(v) > split_ver(self.sros_full_ver):
                 self.sros_full_ver = v
+                self.sros_ver, self.sros_build = self.get_version(os.path.join(base, p, "SystemVersion.plist"))
 
     def get_nvram_data(self):
         nvram_data = subprocess.run(["nvram", "-p"],
@@ -146,7 +149,7 @@ def show(self):
         else:
             p_info(f"  No Fallback System Firmware / rOS")
         p_info(f"  SFR version: {col()}{self.sfr_full_ver}")
-        p_info(f"  SystemRecovery version: {col()}{self.sros_full_ver}")
+        p_info(f"  SystemRecovery version: {col()}{self.sros_full_ver} ({self.sros_ver} {self.sros_build})")
         p_info(f"  Login user: {col()}{self.login_user}")
 
     def get_child(self, obj, name):