Remove unnecessary system imports for MacOS and redundant qualifications of FilePath

Author: cmcgee1024

Sources/Swiftly/Proxy.swift

@@ -71,14 +71,22 @@ public enum Proxy {
 
             let env = try await Swiftly.currentPlatform.proxyEnvironment(ctx, env: .inherit, toolchain: toolchain)
 
-            _ = try await Subprocess.run(
+            let cmdConfig = Configuration(
                 .name(binName),
                 arguments: Arguments(Array(CommandLine.arguments[1...])),
-                environment: env.updating(["SWIFTLY_PROXY_IN_PROGRESS": "1"]),
+                environment: env.updating(["SWIFTLY_PROXY_IN_PROGRESS": "1"])
+            )
+
+            let cmdResult = try await Subprocess.run(
+                cmdConfig,
                 input: .standardInput,
                 output: .standardOutput,
                 error: .standardError
             )
+
+            if !cmdResult.terminationStatus.isSuccess {
+                throw RunProgramError(terminationStatus: cmdResult.terminationStatus, config: cmdConfig)
+            }
         } catch let terminated as RunProgramError {
             switch terminated.terminationStatus {
             case let .exited(code):

Sources/TestSwiftly/TestSwiftly.swift

@@ -93,13 +93,13 @@ struct TestSwiftly: AsyncParsableCommand {
             Foundation.exit(2)
         }
 
-        guard case let swiftlyArchive = FilePath(swiftlyArchive) else { fatalError("") }
+        let swiftlyArchiveFile = FilePath(swiftlyArchive)
 
         print("Extracting swiftly release")
 #if os(Linux)
-        try await sys.tar().extract(.verbose, .compressed, .archive(swiftlyArchive)).run()
+        try await sys.tar().extract(.verbose, .compressed, .archive(swiftlyArchiveFile)).run()
 #elseif os(macOS)
-        try await sys.installer(.verbose, .pkg(swiftlyArchive), .target("CurrentUserHomeDirectory")).run()
+        try await sys.installer(.verbose, .pkg(swiftlyArchiveFile), .target("CurrentUserHomeDirectory")).run()
 #endif
 
 #if os(Linux)
@@ -160,7 +160,11 @@ struct TestSwiftly: AsyncParsableCommand {
 
         if NSUserName() == "root" {
             if try await fs.exists(atPath: "./post-install.sh") {
-                _ = try await Subprocess.run(.path(shell), arguments: ["./post-install.sh"], input: .standardInput, output: .standardOutput, error: .standardError)
+                let config = Configuration(.path(shell), arguments: ["./post-install.sh"])
+                let result = try await Subprocess.run(config, input: .standardInput, output: .standardOutput, error: .standardError)
+                if !result.terminationStatus.isSuccess {
+                    throw RunProgramError(terminationStatus: result.terminationStatus, config: config)
+                }
             }
             swiftReady = true
         } else if try await fs.exists(atPath: "./post-install.sh") {

Tests/SwiftlyTests/SwiftlyTests.swift

@@ -10,7 +10,6 @@ import Testing
 
 #if os(macOS)
 import MacOSPlatform
-import System
 #endif
 
 import AsyncHTTPClient
@@ -73,7 +72,7 @@ extension Config {
 
 extension SwiftlyCoreContext {
     public init(
-        mockedHomeDir: SystemPackage.FilePath?,
+        mockedHomeDir: FilePath?,
         httpRequestExecutor: HTTPRequestExecutor,
         outputHandler: (any OutputHandler)?,
         inputProvider: (any InputProvider)?,
@@ -284,7 +283,7 @@ public enum SwiftlyTests {
         return await handler.lines
     }
 
-    static func getTestHomePath(name: String) -> SystemPackage.FilePath {
+    static func getTestHomePath(name: String) -> FilePath {
         fs.tmp / "swiftly-tests-\(name)-\(UUID())"
     }
 
@@ -461,7 +460,7 @@ public enum SwiftlyTests {
     }
 
     /// Get the toolchain version of a mocked executable installed via `installMockedToolchain` at the given FilePath.
-    static func getMockedToolchainVersion(at path: SystemPackage.FilePath) throws -> ToolchainVersion {
+    static func getMockedToolchainVersion(at path: FilePath) throws -> ToolchainVersion {
         let process = Process()
         process.executableURL = URL(fileURLWithPath: path.string)
 
@@ -512,7 +511,7 @@ public actor TestInputProvider: SwiftlyCore.InputProvider {
 
 /// Wrapper around a `swift` executable used to execute swift commands.
 public struct SwiftExecutable {
-    public let path: SystemPackage.FilePath
+    public let path: FilePath
 
     private static func stableRegex() -> Regex<(Substring, Substring)> {
         try! Regex("swift-([^-]+)-RELEASE")