fix actionButtonPath for major upgrades and add more logs

macadmins · Feb 27, 2024 · 039296c · 039296c
1 parent c29a2fe
commit 039296c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Nudge/UI/Main.swift b/Nudge/UI/Main.swift
@@ -354,9 +354,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     private func handleNoAttemptToFetchMajorUpgrade() {
         if !majorUpgradeAppPathExists && !majorUpgradeBackupAppPathExists {
-            LogManager.error("Unable to find major upgrade application, exiting Nudge", logger: uiLog)
-            nudgePrimaryState.shouldExit = true
-            exit(1)
+            LogManager.error("Unable to find major upgrade application, reverting to actionButtonPath", logger: uiLog)
         }
     }
 
@@ -386,7 +384,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 handleNoAttemptToFetchMajorUpgrade()
             }
         } else {
-            LogManager.warning("actionButtonPath is nil or empty - actionButton will be unable to trigger any action required for major upgrades", logger: prefsProfileLog)
+            LogManager.warning("actionButtonPath is nil or empty - actionButton will be attempt to use /System/Library/CoreServices/Software Update.app for major upgrades", logger: prefsProfileLog)
             return
         }
     }

diff --git a/Nudge/Utilities/SoftwareUpdate.swift b/Nudge/Utilities/SoftwareUpdate.swift
@@ -43,7 +43,7 @@ class SoftwareUpdate {
                     GlobalVariables.fetchMajorUpgradeSuccessful = true
                     // Update the state based on the download result
                 }
-            } else {
+            } else if majorUpgradeAppPathExists || majorUpgradeBackupAppPathExists {
                 LogManager.notice("Found major upgrade application or backup - skipping download", logger: softwareupdateListLog)
             }
         } else {

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -791,7 +791,7 @@ struct UIUtilities {
     private func determineUpdateURL() -> URL? {
         if let actionButtonPath = FeatureVariables.actionButtonPath {
             if actionButtonPath.isEmpty {
-                LogManager.warning("actionButtonPath is set but contains an empty string. Defaulting to out of box behavior.", logger: utilsLog)
+                LogManager.warning("actionButtonPath is set but contains an empty string. Defaulting to /System/Library/CoreServices/Software Update.app.", logger: utilsLog)
                 return URL(fileURLWithPath: "/System/Library/CoreServices/Software Update.app")
             }
 
@@ -818,6 +818,7 @@ struct UIUtilities {
             }
         }
 
+        LogManager.warning("Defaulting actionButtonPath to /System/Library/CoreServices/Software Update.app.", logger: utilsLog)
         return URL(fileURLWithPath: "/System/Library/CoreServices/Software Update.app")
     }