Set brew path option after installation

milanvarady · Jan 11, 2025 · 0a38dc5 · 0a38dc5
1 parent 5a9f6c3
commit 0a38dc5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Applite/Utilities/Brew Installation/DependencyManager.swift b/Applite/Utilities/Brew Installation/DependencyManager.swift
@@ -97,18 +97,27 @@ struct DependencyManager {
 
         try await Shell.runAsync("curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C \(BrewPaths.appBrewDirectory.quotedPath())")
 
+        // Set selected Homebrew path to Applite's installation
+        BrewPaths.selectedBrewOption = .appPath
+
         Self.logger.info("Brew install done")
     }
 
-    static func detectHomebrew() async -> BrewPaths.PathOption? {
+    static func detectHomebrew(setPathOption: Bool) async -> BrewPaths.PathOption? {
         async let appleSilicon = BrewPaths.isBrewPathValid(at: BrewPaths.getBrewExectuablePath(for: .defaultAppleSilicon))
         async let intel = BrewPaths.isBrewPathValid(at: BrewPaths.getBrewExectuablePath(for: .defaultIntel))
 
         if await appleSilicon {
+            if setPathOption {
+                BrewPaths.selectedBrewOption = .defaultAppleSilicon
+            }
             return .defaultAppleSilicon
         }
 
         if await intel {
+            if setPathOption {
+                BrewPaths.selectedBrewOption = .defaultIntel
+            }
             return .defaultIntel
         }
 

diff --git a/Applite/Views/Setup/SetupView.swift b/Applite/Views/Setup/SetupView.swift
@@ -83,11 +83,7 @@ struct SetupView: View {
             }
         }
         .task {
-            detectedBrewInstallation = await DependencyManager.detectHomebrew()
-
-            if let brewInstallation = detectedBrewInstallation {
-                BrewPaths.selectedBrewOption = brewInstallation
-            }
+            detectedBrewInstallation = await DependencyManager.detectHomebrew(setPathOption: true)
         }
     }
 }