Normalize requiredMinimumOSVersion of patch is .0

Author: erikng

Nudge/Preferences/DefaultPreferencesNudge.swift

@@ -28,6 +28,7 @@ let majorUpgradeAppPathExists = FileManager.default.fileExists(atPath: majorUpgr
 let majorUpgradeBackupAppPathExists = FileManager.default.fileExists(atPath: Utils().getBackupMajorUpgradeAppPath())
 let requiredInstallationDate = osVersionRequirementsProfile?.requiredInstallationDate ?? osVersionRequirementsJSON?.requiredInstallationDate ?? Date(timeIntervalSince1970: 0)
 let requiredMinimumOSVersion = osVersionRequirementsProfile?.requiredMinimumOSVersion ?? osVersionRequirementsJSON?.requiredMinimumOSVersion ?? "0.0"
+let requiredMinimumOSVersionNormalized = try! OSVersion(requiredMinimumOSVersion).description
 let aboutUpdateURL = getAboutUpdateURL(OSVerReq: osVersionRequirementsProfile) ?? getAboutUpdateURL(OSVerReq: osVersionRequirementsJSON) ?? ""
 
 // userExperience

Nudge/UI/StandardMode/LeftSide.swift

@@ -47,7 +47,7 @@ struct StandardModeLeftSide: View {
                         Text("Required OS Version:".localized(desiredLanguage: getDesiredLanguage()))
                             .fontWeight(.bold)
                         Spacer()
-                        Text(String(requiredMinimumOSVersion))
+                        Text(String(requiredMinimumOSVersionNormalized))
                             .foregroundColor(.secondary)
                             .fontWeight(.bold)
                     }

Nudge/Utilities/SoftwareUpdate.swift

@@ -75,7 +75,7 @@ class SoftwareUpdate {
                 softwareupdateListLog.notice("\(msg, privacy: .public)")
                 let task = Process()
                 task.launchPath = "/usr/sbin/softwareupdate"
-                task.arguments = ["--fetch-full-installer", "--full-installer-version", requiredMinimumOSVersion]
+                task.arguments = ["--fetch-full-installer", "--full-installer-version", requiredMinimumOSVersionNormalized]
 
                 let outputPipe = Pipe()
                 let errorPipe = Pipe()

Nudge/Utilities/Utils.swift

@@ -139,9 +139,9 @@ struct Utils {
     }
 
     func fullyUpdated() -> Bool {
-        let fullyUpdated = versionGreaterThanOrEqual(currentVersion: currentOSVersion, newVersion: requiredMinimumOSVersion)
+        let fullyUpdated = versionGreaterThanOrEqual(currentVersion: currentOSVersion, newVersion: requiredMinimumOSVersionNormalized)
         if fullyUpdated {
-            let msg = "Current operating system (\(currentOSVersion)) is greater than or equal to required operating system (\(requiredMinimumOSVersion))"
+            let msg = "Current operating system (\(currentOSVersion)) is greater than or equal to required operating system (\(requiredMinimumOSVersionNormalized))"
             utilsLog.notice("\(msg, privacy: .public)")
             return true
         } else {
@@ -228,7 +228,7 @@ struct Utils {
     }
 
     func getMajorRequiredNudgeOSVersion() -> Int {
-        let parts = requiredMinimumOSVersion.split(separator: ".", omittingEmptySubsequences: false)
+        let parts = requiredMinimumOSVersionNormalized.split(separator: ".", omittingEmptySubsequences: false)
         let majorRequiredNudgeOSVersion = Int((parts[0]))!
         if !nudgePrimaryState.hasLoggedMajorRequiredOSVersion {
             nudgePrimaryState.hasLoggedMajorRequiredOSVersion = true
@@ -408,11 +408,11 @@ struct Utils {
     }
 
     func logRequiredMinimumOSVersion() {
-        nudgeDefaults.set(requiredMinimumOSVersion, forKey: "requiredMinimumOSVersion")
+        nudgeDefaults.set(requiredMinimumOSVersionNormalized, forKey: "requiredMinimumOSVersion")
     }
 
     func newNudgeEvent() -> Bool {
-        versionGreaterThan(currentVersion: requiredMinimumOSVersion, newVersion: nudgePrimaryState.userRequiredMinimumOSVersion)
+        versionGreaterThan(currentVersion: requiredMinimumOSVersionNormalized, newVersion: nudgePrimaryState.userRequiredMinimumOSVersion)
     }
 
     func openMoreInfo() {