fix terminal command generation (#889)

* fix the terminal command generation to run the executable instead of a directory * fix swiftlint violations Signed-off-by: iivusly <[email protected]> --------- Signed-off-by: iivusly <[email protected]>
Whisky-App · Mar 28, 2024 · 90c9561 · 90c9561
1 parent 977ff34
commit 90c9561
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/WhiskyKit/Sources/WhiskyKit/Extensions/Program+Extensions.swift b/WhiskyKit/Sources/WhiskyKit/Extensions/Program+Extensions.swift
@@ -47,7 +47,9 @@ extension Program {
     }
 
     public func generateTerminalCommand() -> String {
-        return Wine.generateRunCommand(bottle: bottle, args: settings.arguments, environment: generateEnvironment())
+        return Wine.generateRunCommand(
+            at: self.url, bottle: bottle, args: settings.arguments, environment: generateEnvironment()
+        )
     }
 
     public func runInTerminal() {

diff --git a/WhiskyKit/Sources/WhiskyKit/Wine/Wine.swift b/WhiskyKit/Sources/WhiskyKit/Wine/Wine.swift
@@ -111,8 +111,10 @@ public class Wine {
         ) { }
     }
 
-    public static func generateRunCommand(bottle: Bottle, args: String, environment: [String: String]) -> String {
-        var wineCmd = "\(wineBinary.esc) start /unix \(bottle.url.esc) \(args)"
+    public static func generateRunCommand(
+        at url: URL, bottle: Bottle, args: String, environment: [String: String]
+    ) -> String {
+        var wineCmd = "\(wineBinary.esc) start /unix \(url.path(percentEncoded: false)) \(args)"
         let env = constructWineEnvironment(for: bottle, environment: environment)
         for environment in env {
             wineCmd = "\(environment.key)=\(environment.value) " + wineCmd