[macOS] Remove embedded flasher binaries

qmk · Apr 29, 2024 · ff8b23b · ff8b23b
1 parent c92b7ed
commit ff8b23b
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 113 deletions.
diff --git a/macos/QMK Toolbox.xcodeproj/project.pbxproj b/macos/QMK Toolbox.xcodeproj/project.pbxproj
diff --git a/macos/QMK Toolbox/Resources/avrdude b/macos/QMK Toolbox/Resources/avrdude
diff --git a/macos/QMK Toolbox/Resources/bootloadHID b/macos/QMK Toolbox/Resources/bootloadHID
diff --git a/macos/QMK Toolbox/Resources/dfu-programmer b/macos/QMK Toolbox/Resources/dfu-programmer
diff --git a/macos/QMK Toolbox/Resources/dfu-util b/macos/QMK Toolbox/Resources/dfu-util
diff --git a/macos/QMK Toolbox/Resources/hid_bootloader_cli b/macos/QMK Toolbox/Resources/hid_bootloader_cli
diff --git a/macos/QMK Toolbox/Resources/libavrdude.1.0.0.dylib b/macos/QMK Toolbox/Resources/libavrdude.1.0.0.dylib
diff --git a/macos/QMK Toolbox/Resources/libftdi1.2.5.0.dylib b/macos/QMK Toolbox/Resources/libftdi1.2.5.0.dylib
diff --git a/macos/QMK Toolbox/Resources/libhidapi.0.14.0.dylib b/macos/QMK Toolbox/Resources/libhidapi.0.14.0.dylib
diff --git a/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib b/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib
diff --git a/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib b/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib
diff --git a/macos/QMK Toolbox/Resources/mdloader b/macos/QMK Toolbox/Resources/mdloader
diff --git a/macos/QMK Toolbox/Resources/teensy_loader_cli b/macos/QMK Toolbox/Resources/teensy_loader_cli
diff --git a/macos/QMK Toolbox/Resources/wb32-dfu-updater_cli b/macos/QMK Toolbox/Resources/wb32-dfu-updater_cli
diff --git a/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift b/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift
@@ -52,12 +52,26 @@ class BootloaderDevice: USBDeviceProtocol, CustomStringConvertible {
 
     func reset(_ mcu: String) {}
 
+    func resolveHomebrewBinary(for command: String) -> URL? {
+        let fileManager = FileManager()
+        if fileManager.fileExists(atPath: "/opt/homebrew/bin/\(command)") {
+            return URL(fileURLWithPath: "/opt/homebrew/bin/\(command)")
+        } else if fileManager.fileExists(atPath: "/usr/local/bin/\(command)") {
+            return URL(fileURLWithPath: "/usr/local/bin/\(command)")
+        }
+        return nil
+    }
+
     func runProcess(_ command: String, args: [String]) {
         print(message: "\(command) \(args.joined(separator: " "))", type: .command)
 
+        guard let resolvedCommand = resolveHomebrewBinary(for: command) else {
+            print(message: "\(command) does not seem to be installed!", type: .error)
+            return
+        }
+
         let task = Process()
-        task.executableURL = Bundle.main.url(forResource: command, withExtension: nil)
-        task.currentDirectoryURL = Bundle.main.resourceURL
+        task.executableURL = resolvedCommand
         task.arguments = args
 
         let outPipe = Pipe()