Merge pull request #15 from zachberger/master

Add support for custom brew installation path

Brewlet/AppDelegate.swift

@@ -384,11 +384,15 @@ class AppDelegate: NSObject, NSApplicationDelegate, PreferencesDelegate {
             // Sync with brew
             let data = String(decoding: data, as: UTF8.self)
             let lines = data.split(separator: "\n")
-            for line in lines[1...] {
-                let parts = line.split(separator: " ", maxSplits: Int.max, omittingEmptySubsequences: true)
-                let package = parts[0]
-                let isStopped = parts[1] == "stopped"
-                services.append(Service(name: String(package), isStopped: isStopped))
+
+            // Check that there are services before parsing the output
+            if lines.count > 0 {
+                for line in lines[1...] {
+                    let parts = line.split(separator: " ", maxSplits: Int.max, omittingEmptySubsequences: true)
+                    let package = parts[0]
+                    let isStopped = parts[1] == "stopped"
+                    services.append(Service(name: String(package), isStopped: isStopped))
+                }
             }
 
             // Update UI
@@ -492,9 +496,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, PreferencesDelegate {
     func run_command(arguments: [String],
                      fileRedirect: FileHandle? = nil,
                      outputHandler: @escaping (Process,Data) -> Void) {
+        #if arch(arm64)
+        let brewPath = userDefaults.string(forKey: "brewPath") ?? PreferencesController.HomebrewPath.appleSilicon.rawValue
+        #elseif arch(x86_64)
+        let brewPath = userDefaults.string(forKey: "brewPath") ?? PreferencesController.HomebrewPath.intel.rawValue
+        #endif
         let task = Process()
         task.launchPath = "/bin/bash"
-        task.arguments = ["/usr/local/Homebrew/bin/brew"] + arguments
+        task.arguments = [brewPath] + arguments
 
         let pipe = Pipe()
         var allData = Data() // What happens to the scope of this variable when used inside the closure??
@@ -670,6 +679,18 @@ class AppDelegate: NSObject, NSApplicationDelegate, PreferencesDelegate {
         self.setupTimers()
     }
 
+    /**
+     Handle a change of preferences for where the brew binary is.
+
+     - Parameter newState: The new state of the textfield.
+     */
+    func brewPathChanged(newPath: String) {
+        // Update defaults and rerun update
+        userDefaults.set(newPath, forKey: "brewPath")
+        check_outdated()
+        update_info()
+    }
+
     // MARK: - Termination functions
 
     /**

Brewlet/PreferencesController.swift

@@ -13,6 +13,7 @@ protocol PreferencesDelegate {
     func updateIntervalChanged(newInterval: TimeInterval?) // if nil, then don't update
     func includeDependenciesChanged(newState: NSControl.StateValue)
     func shareAnalyticsChanged(newState: NSControl.StateValue)
+    func brewPathChanged(newPath: String)
 }
 
 class PreferencesController: NSWindowController {
@@ -22,9 +23,19 @@ class PreferencesController: NSWindowController {
     @IBOutlet weak var shareAnalytics: NSButton!
     @IBOutlet weak var autoUpgrade: NSButton!
     @IBOutlet weak var dontNotifyAvailable: NSButton!
-
+    @IBOutlet weak var brewPath: NSTextField!
+    @IBOutlet weak var intel: NSButton!
+    @IBOutlet weak var appleSilicon: NSButton!
+    @IBOutlet weak var custom: NSButton!
+
     var delegate: PreferencesDelegate?
 
+    enum HomebrewPath: String {
+        case appleSilicon = "/opt/homebrew/bin/brew"
+        case intel = "/usr/local/bin/brew"
+        case custom = ""
+    }
+
     override func windowDidLoad() {
         super.windowDidLoad()
 
@@ -57,6 +68,21 @@ class PreferencesController: NSWindowController {
 
         autoUpgrade.state = defaults.bool(forKey: "autoUpgrade") ? .on : .off
         dontNotifyAvailable.state = defaults.bool(forKey: "dontNotify") ? .on : .off
+
+        #if arch(arm64)
+        let currentBrewPath = defaults.string(forKey: "brewPath") ?? HomebrewPath.appleSilicon.rawValue
+        #elseif arch(x86_64)
+        let currentBrewPath = defaults.string(forKey: "brewPath") ?? HomebrewPath.intel.rawValue
+        #endif
+        switch currentBrewPath {
+        case HomebrewPath.intel.rawValue:
+            intelSelected(nil)
+        case HomebrewPath.appleSilicon.rawValue:
+            appleSiliconSelected(nil)
+        default:
+            custom.state = .on
+            brewPath.stringValue = currentBrewPath
+        }
     }
 
     @IBAction func includeDependenciesPressed(_ sender: NSButton) {
@@ -89,7 +115,40 @@ class PreferencesController: NSWindowController {
         }
 
         delegate?.updateIntervalChanged(newInterval: seconds)
-    }    
+    }
+
+    @IBAction func appleSiliconSelected(_ sender: Any?) {
+        appleSilicon.state = .on
+        intel.state = .off
+        custom.state = .off
+        brewPath.isEnabled = false
+        let path = HomebrewPath.appleSilicon.rawValue
+        brewPath.stringValue = path
+        delegate?.brewPathChanged(newPath: path)
+    }
+
+    @IBAction func intelSelected(_ sender: Any?) {
+        intel.state = .on
+        appleSilicon.state = .off
+        custom.state = .off
+        brewPath.isEnabled = false
+        let path = HomebrewPath.intel.rawValue
+        brewPath.stringValue = path
+        delegate?.brewPathChanged(newPath: path)
+    }
+
+    @IBAction func customSelected(_ sender: Any) {
+        custom.state = .on
+        appleSilicon.state = .off
+        intel.state = .off
+        brewPath.isEnabled = true
+        delegate?.brewPathChanged(newPath: brewPath.stringValue)
+    }
+
+    @IBAction func brewPathChanged(_ sender: NSTextField) {
+        // TODO: Validate that the path is valid
+        delegate?.brewPathChanged(newPath: sender.stringValue)
+    }
 
     override var windowNibName : String! {
         return "PreferencesController"