Repository navigation
Fix SSH LocalCommand incompatibility with Fish shell (#2706) #3506
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d624edd
Fix SSH command wrappers for fish shells
zicochaos 74a7689
fix: extract fish shell SSH support to pass file-length budget
austinywang 08e7422
Restore CircleCI Bun setup in Docker jobs
austinywang 8b11f12
Merge main to validate fish shell SSH fix against current CI
austinywang b6c39bc
Centralize OpenSSH command wrapping for shell neutrality
austinywang 92eaf3f
Harden fish SSH regression coverage
austinywang 8ad0ddf
Match OpenSSH behavior in fish SSH test harness
austinywang c21eee3
Retrigger PR checks after review feedback resolution
austinywang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import Foundation | ||
|
|
||
| extension CMUXCLI { | ||
| internal func openSSHLocalCommandValue(shellScript: String?) -> String? { | ||
| guard let shellScript else { return nil } | ||
| let trimmed = shellScript.trimmingCharacters(in: .whitespacesAndNewlines) | ||
| guard !trimmed.isEmpty else { return nil } | ||
| return openSSHCommandOptionValue(posixShellCommand(trimmed)) | ||
| } | ||
|
|
||
| internal func openSSHRemoteCommandValue(shellScript: String) -> String { | ||
| openSSHCommandOptionValue(posixShellCommand(shellScript)) | ||
| } | ||
|
|
||
| internal func posixShellCommand(_ shellScript: String) -> String { | ||
| "/bin/sh -c " + shellQuote(shellScript) | ||
| } | ||
|
|
||
| internal func openSSHCommandOptionValue(_ command: String) -> String { | ||
| command.replacingOccurrences(of: "%", with: "%%") | ||
| } | ||
|
|
||
| /// Joins self-delimiting POSIX shell snippets with one space; this is not a general shell combiner. | ||
| internal func combinedLocalShellScript(_ parts: [String?]) -> String? { | ||
| let filtered = parts.compactMap { raw -> String? in | ||
| guard let raw else { return nil } | ||
| let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines) | ||
| return trimmed.isEmpty ? nil : trimmed | ||
| } | ||
| guard !filtered.isEmpty else { return nil } | ||
| return filtered.joined(separator: " ") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,4 +54,3 @@ extension WorkspaceContentView { | |
| ].joined(separator: "|") | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -113,4 +113,3 @@ final class GhosttyDefaultBackgroundNotificationDispatcherTests: XCTestCase { | |
| return -1 | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.