diff --git a/DockPhobia.xcworkspace/xcuserdata/neon443.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DockPhobia.xcworkspace/xcuserdata/neon443.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..4ce05a4 --- /dev/null +++ b/DockPhobia.xcworkspace/xcuserdata/neon443.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/DockPhobia/DockPhobiaApp.swift b/DockPhobia/DockPhobiaApp.swift index bc2e29c..f6ec38d 100644 --- a/DockPhobia/DockPhobiaApp.swift +++ b/DockPhobia/DockPhobiaApp.swift @@ -82,7 +82,7 @@ struct DockPhobiaApp: App { .keyboardShortcut(",") Divider() Button("try shell") { - print(shell("echo hello") ?? "fuck me") + print(shell("echo hello")) } Divider() Button("Move Dock to Right") { @@ -114,24 +114,29 @@ func shell(_ command: String) -> (output: String?, error: String?) { let pipe = Pipe() let pipeError = Pipe() - process.executableURL = URL(fileURLWithPath: "/bin/bash") + process.executableURL = URL(fileURLWithPath: "/bin/zsh") process.arguments = ["-c", command] process.standardOutput = pipe process.standardError = pipeError let outputHandle = pipe.fileHandleForReading - let errorHandle = pipeError.fileHandleForReading + let outputErrorHandle = pipeError.fileHandleForReading process.launch() process.waitUntilExit() let data = outputHandle.readDataToEndOfFile() - let dataError = errorHandle.readDataToEndOfFile() + let dataError = outputErrorHandle.readDataToEndOfFile() - let output = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) - let outputError = String(data: dataError, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) - - return (output, outputError) + let output = String( + data: data, + encoding: .utf8 + )?.trimmingCharacters(in: .whitespacesAndNewlines) + let outputError = String( + data: dataError, + encoding: .utf8 + )?.trimmingCharacters(in: .whitespacesAndNewlines) + return (output: output, error: outputError) } func getDockSide() -> String {