Skip to content

shell-integration: route Supaterm SSH through the internal command #7

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.

Sign up for GitHub

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

Closed
khoi wants to merge 1 commit into from
Closed

shell-integration: route Supaterm SSH through the internal command #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/shell-integration/bash/ghostty.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fi
#
if [[ -x "${SUPATERM_CLI_PATH:-}" && ! -x "${GHOSTTY_BIN_DIR:-}/ghostty" ]]; then
function ssh() {
"$SUPATERM_CLI_PATH" ssh -- "$@"
"$SUPATERM_CLI_PATH" internal ssh -- "$@"
}
elif [[ "$GHOSTTY_SHELL_FEATURES" == *ssh-* ]]; then
function ssh() {
Expand Down
2 changes: 1 addition & 1 deletion src/shell-integration/elvish/lib/ghostty-integration.elv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
}

fn ssh-supaterm {|@args|
$E:SUPATERM_CLI_PATH ssh -- $@args
$E:SUPATERM_CLI_PATH internal ssh -- $@args
}

fn ssh-integration {|@args|
Expand Down
2 changes: 1 addition & 1 deletion src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function __ghostty_setup --on-event fish_prompt -d "Setup ghostty integration"
set -l features (string split ',' -- "$GHOSTTY_SHELL_FEATURES")
if test -x "$SUPATERM_CLI_PATH"; and not test -x "$GHOSTTY_BIN_DIR/ghostty"
function ssh --wraps=ssh --description "SSH wrapper with Supaterm integration"
"$SUPATERM_CLI_PATH" ssh -- $argv
"$SUPATERM_CLI_PATH" internal ssh -- $argv
end
else if contains ssh-env $features; or contains ssh-terminfo $features
function ssh --wraps=ssh --description "SSH wrapper with Ghostty integration"
Expand Down
2 changes: 1 addition & 1 deletion src/shell-integration/nushell/vendor/autoload/ghostty.nu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export module ghostty {
let ghostty = ($env.GHOSTTY_BIN_DIR? | default "") | path join "ghostty"
let ghostty_executable = which $ghostty | is-not-empty
if ((which $supaterm_cli | is-not-empty) and (not $ghostty_executable)) {
^$supaterm_cli "ssh" "--" ...$args
^$supaterm_cli "internal" "ssh" "--" ...$args
return
}

Expand Down
2 changes: 1 addition & 1 deletion src/shell-integration/zsh/ghostty-integration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ _ghostty_deferred_init() {
#
if [[ -x "${SUPATERM_CLI_PATH:-}" && ! -x "${GHOSTTY_BIN_DIR:-}/ghostty" ]]; then
function ssh() {
"$SUPATERM_CLI_PATH" ssh -- "$@"
"$SUPATERM_CLI_PATH" internal ssh -- "$@"
}
elif [[ "$GHOSTTY_SHELL_FEATURES" == *ssh-* ]]; then
function ssh() {
Expand Down
2 changes: 1 addition & 1 deletion test/shell-integration/supaterm-ssh.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ assert_route() {
printf '%s\n' "$shell_name route passed"
}

printf '%s\n' ssh -- -p 2222 'user@example host' >"$expected_path"
printf '%s\n' internal ssh -- -p 2222 'user@example host' >"$expected_path"

"${test_env[@]}" bash --noprofile --norc -i -c \
"source \"\$1\"; ssh -p 2222 \"user@example host\"" \
Expand Down
Loading