From 40203eea67ea995b878ce8f03cab067e8e3593d4 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Mon, 7 Dec 2020 15:30:35 -0800 Subject: [PATCH] Update some other os version comparisons in Managed Software Center so they function correctly when compiled against the Big Sur SDK --- .../Controllers/MainWindowController.swift | 12 ++++-------- .../Managed Software Center/MunkiItems.swift | 15 +++++++-------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift b/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift index 545a4f17..a486e9c2 100755 --- a/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift +++ b/code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift @@ -905,16 +905,12 @@ class MainWindowController: NSWindowController, NSWindowDelegate, WKNavigationDe } func clearCache() { - var osMinorVers = 9 if #available(OSX 10.10, *) { - osMinorVers = ProcessInfo().operatingSystemVersion.minorVersion - } - if osMinorVers >= 11 { - if #available(OSX 10.11, *) { + let os_vers = OperatingSystemVersion(majorVersion: 10, minorVersion: 11, patchVersion: 0) + if ProcessInfo().isOperatingSystemAtLeast(os_vers) { let cacheDataTypes = Set([WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache]) - - let dateFrom = Date.init(timeIntervalSince1970: 0) - WKWebsiteDataStore.default().removeData(ofTypes: cacheDataTypes, modifiedSince: dateFrom, completionHandler: {}) + let dateFrom = Date.init(timeIntervalSince1970: 0) + WKWebsiteDataStore.default().removeData(ofTypes: cacheDataTypes, modifiedSince: dateFrom, completionHandler: {}) } } else { // Fallback on earlier versions diff --git a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift index f54915b2..cb0006dd 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift +++ b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift @@ -1267,15 +1267,14 @@ func updatesRequireRestart() -> Bool { func appleUpdatesRequireRestartOnMojaveAndUp() -> Bool { // Return true if any item in the apple update list requires a restart - var osMinorVers = 9 if #available(OSX 10.10, *) { - osMinorVers = ProcessInfo().operatingSystemVersion.minorVersion - } - if osMinorVers >= 14 { - let requiresRestart = getAppleUpdates().filter( - { ($0["RestartAction"] as? String ?? "").hasSuffix("Restart") } - ).count > 0 - return requiresRestart + let os_vers = OperatingSystemVersion(majorVersion: 10, minorVersion: 14, patchVersion: 0) + if ProcessInfo().isOperatingSystemAtLeast(os_vers) { + let requiresRestart = getAppleUpdates().filter( + { ($0["RestartAction"] as? String ?? "").hasSuffix("Restart") } + ).count > 0 + return requiresRestart + } } return false }