allow major upgrades if actionButtonPath is set

macadmins · Nov 22, 2021 · 5a303d8 · 5a303d8
1 parent 955e6bb
commit 5a303d8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Nudge/UI/Main.swift b/Nudge/UI/Main.swift
@@ -88,6 +88,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
         self.runSoftwareUpdate()
         if Utils().requireMajorUpgrade() {
+            if actionButtonPath != nil {
+                if !actionButtonPath!.isEmpty {
+                    return
+                } else {
+                    let msg = "actionButtonPath contains empty string - actionButton will be unable to trigger any action required for major upgrades"
+                    prefsProfileLog.warning("\(msg, privacy: .public)")
+                    return
+                }
             if attemptToFetchMajorUpgrade == true && fetchMajorUpgradeSuccessful == false && (majorUpgradeAppPathExists == false && majorUpgradeBackupAppPathExists == false) {
                 let msg = "Unable to fetch major upgrade and application missing, exiting Nudge"
                 uiLog.error("\(msg, privacy: .public)")

diff --git a/Nudge/Utilities/SoftwareUpdate.swift b/Nudge/Utilities/SoftwareUpdate.swift
@@ -54,6 +54,10 @@ class SoftwareUpdate {
         }
 
         if Utils().requireMajorUpgrade() {
+            if actionButtonPath != nil {
+                return
+            }
+
             if attemptToFetchMajorUpgrade == true {
                 if majorUpgradeAppPathExists {
                     let msg = "found major upgrade application - skipping download"