Use fully qualified command paths only if the binary can be found in the selected toolchain

Author: cmcgee1024

Sources/Swiftly/Run.swift

@@ -105,6 +105,9 @@ struct Run: SwiftlyCommand {
 
             try await Swiftly.currentPlatform.proxy(ctx, toolchain, command[0], [String](command[1...]))
         } catch let terminated as RunProgramError {
+            if ctx.mockedHomeDir != nil {
+                throw terminated
+            }
             Foundation.exit(terminated.exitCode)
         } catch {
             throw error

Sources/SwiftlyCore/Platform.swift

@@ -167,11 +167,19 @@ extension Platform {
     public func proxy(_ ctx: SwiftlyCoreContext, _ toolchain: ToolchainVersion, _ command: String, _ arguments: [String], _ env: [String: String] = [:]) async throws {
         let tcPath = self.findToolchainLocation(ctx, toolchain).appendingPathComponent("usr/bin")
 
+        let commandTcPath = tcPath.appendingPathComponent(command)
+        let commandToRun = if FileManager.default.fileExists(atPath: commandTcPath.path) {
+            commandTcPath.path
+        } else {
+            command
+        }
+
         var newEnv = try self.proxyEnv(ctx, env: ProcessInfo.processInfo.environment, toolchain: toolchain)
         for (key, value) in env {
             newEnv[key] = value
         }
-        try self.runProgram([tcPath.appendingPathComponent(command).path] + arguments, env: newEnv)
+
+        try self.runProgram([commandToRun] + arguments, env: newEnv)
     }
 
     /// Proxy the invocation of the provided command to the chosen toolchain and capture the output.
@@ -181,7 +189,15 @@ extension Platform {
     ///
     public func proxyOutput(_ ctx: SwiftlyCoreContext, _ toolchain: ToolchainVersion, _ command: String, _ arguments: [String]) async throws -> String? {
         let tcPath = self.findToolchainLocation(ctx, toolchain).appendingPathComponent("usr/bin")
-        return try await self.runProgramOutput(tcPath.appendingPathComponent(command).path, arguments, env: self.proxyEnv(ctx, env: ProcessInfo.processInfo.environment, toolchain: toolchain))
+
+        let commandTcPath = tcPath.appendingPathComponent(command)
+        let commandToRun = if FileManager.default.fileExists(atPath: commandTcPath.path) {
+            commandTcPath.path
+        } else {
+            command
+        }
+
+        return try await self.runProgramOutput(commandToRun, arguments, env: self.proxyEnv(ctx, env: ProcessInfo.processInfo.environment, toolchain: toolchain))
     }
 
     /// Run a program.