mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-25 08:29:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update some other os version comparisons in Managed Software Center so they function correctly when compiled against the Big Sur SDK

Browse Source
This commit is contained in:
Greg Neagle
2020-12-07 15:30:35 -08:00
parent 221e75b2f3
commit 40203eea67
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
View File

@@ -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

15
code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift
View File

@@ -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
}