Skip to content

Commit b214a64

Browse files
committed
fix bug in major*UpgradeAppPathExists when fetching major upgrade
1 parent de44e7a commit b214a64

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Nudge/Preferences/DefaultPreferencesNudge.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ let enforceMinorUpdates = optionalFeaturesProfile?["enforceMinorUpdates"] as? Bo
2424
let osVersionRequirementsProfile = getOSVersionRequirementsProfile()
2525
let osVersionRequirementsJSON = getOSVersionRequirementsJSON()
2626
let majorUpgradeAppPath = osVersionRequirementsProfile?.majorUpgradeAppPath ?? osVersionRequirementsJSON?.majorUpgradeAppPath ?? ""
27-
let majorUpgradeAppPathExists = FileManager.default.fileExists(atPath: majorUpgradeAppPath)
28-
let majorUpgradeBackupAppPathExists = FileManager.default.fileExists(atPath: Utils().getBackupMajorUpgradeAppPath())
27+
var majorUpgradeAppPathExists = FileManager.default.fileExists(atPath: majorUpgradeAppPath)
28+
var majorUpgradeBackupAppPathExists = FileManager.default.fileExists(atPath: Utils().getBackupMajorUpgradeAppPath())
2929
let requiredInstallationDate = osVersionRequirementsProfile?.requiredInstallationDate ?? osVersionRequirementsJSON?.requiredInstallationDate ?? Date(timeIntervalSince1970: 0)
3030
let requiredMinimumOSVersion = osVersionRequirementsProfile?.requiredMinimumOSVersion ?? osVersionRequirementsJSON?.requiredMinimumOSVersion ?? "0.0"
3131
let requiredMinimumOSVersionNormalized = try! OSVersion(requiredMinimumOSVersion).description

Nudge/Utilities/SoftwareUpdate.swift

+4-2
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ class SoftwareUpdate {
101101
if task.terminationStatus != 0 {
102102
softwareupdateDownloadLog.error("Error downloading software updates: \(output, privacy: .public)")
103103
} else {
104-
fetchMajorUpgradeSuccessful = true
105-
let msg = "softwareupdate successfully downloaded available update application"
104+
let msg = "softwareupdate successfully downloaded available update application - updating application paths"
106105
softwareupdateListLog.notice("\(msg, privacy: .public)")
107106
softwareupdateDownloadLog.info("\(output, privacy: .public)")
107+
fetchMajorUpgradeSuccessful = true
108+
majorUpgradeAppPathExists = FileManager.default.fileExists(atPath: majorUpgradeAppPath)
109+
majorUpgradeBackupAppPathExists = FileManager.default.fileExists(atPath: Utils().getBackupMajorUpgradeAppPath())
108110
}
109111
} else {
110112
let msg = "device requires major upgrade but attemptToFetchMajorUpgrade is False - skipping download"

0 commit comments

Comments
 (0)