From 8ccfc86b5687ef303ad62735b32a273acb294f55 Mon Sep 17 00:00:00 2001 From: Alex Mazanov Date: Sat, 13 Feb 2021 20:53:24 -0500 Subject: [PATCH] Working on #161 --- SwiftBar/AppShared.swift | 5 ++++- SwiftBar/Utility/RunScript.swift | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SwiftBar/AppShared.swift b/SwiftBar/AppShared.swift index 1384324..08b5a0f 100644 --- a/SwiftBar/AppShared.swift +++ b/SwiftBar/AppShared.swift @@ -127,7 +127,10 @@ class AppShared: NSObject { return } - let runInTerminalScript = getEnvExportString(env: env).appending(";").appending(script.escaped()) + let runInTerminalScript = getEnvExportString(env: env).appending(";") + .appending(script.escaped()) + .appending(" ") + .appending(args.joined(separator: " ")) var appleScript: String = "" switch Preferences.shared.terminal { case .Terminal: diff --git a/SwiftBar/Utility/RunScript.swift b/SwiftBar/Utility/RunScript.swift index f68683b..bb49c0a 100644 --- a/SwiftBar/Utility/RunScript.swift +++ b/SwiftBar/Utility/RunScript.swift @@ -71,8 +71,9 @@ private extension Process { arguments = args } else { executableURL = URL(fileURLWithPath: "/bin/bash") - arguments = ["-c", "-l", script.escaped()] - arguments?.append(contentsOf: args) + var argsFull = ["-c", "-l", script.escaped()] + argsFull.append(contentsOf: args) + arguments = argsFull } guard let executableURL = executableURL, FileManager.default.fileExists(atPath: executableURL.path) else {