mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-17 15:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: address comprehensive shell integration code review issues

Browse Source 
- Fix elvish function name mismatch and use conj for list operations
- Simplify terminfo installation command per ghostty docs (tic -x -)
- Fix conditional structure to ensure error messages always print
- Remove redundant checks and optimize array initialization
- Use consistent patterns across bash, fish, elvish, and zsh
implementations
This commit is contained in:
Jason Rayne
2025-06-17 16:37:37 -07:00
parent 995fb09813
commit b6bb9abfbc
4 changed files with 82 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/shell-integration/zsh/ghostty-integration
View File

@@ -276,49 +276,50 @@ _ghostty_deferred_init() {
# Level: basic - TERM fix + environment variable propagation
_ghostty_ssh_basic() {
# Fix TERM compatibility and propagate key environment variables
local env_vars=()
# Fix TERM compatibility
if [[ "$TERM" == "xterm-ghostty" ]]; then
TERM=xterm-256color \
GHOSTTY_SHELL_FEATURES="${GHOSTTY_SHELL_FEATURES}" \
builtin command ssh "$@"
env_vars+=("TERM=xterm-256color")
fi
# Propagate Ghostty shell integration environment variables
[[ -n "$GHOSTTY_SHELL_FEATURES" ]] && env_vars+=("GHOSTTY_SHELL_FEATURES=$GHOSTTY_SHELL_FEATURES")
# Execute with environment variables if any were set
if [[ ${#env_vars[@]} -gt 0 ]]; then
env "${env_vars[@]}" ssh "$@"
else
GHOSTTY_SHELL_FEATURES="${GHOSTTY_SHELL_FEATURES}" \
builtin command ssh "$@"
fi
}
# Level: full - All features
_ghostty_ssh_full() {
# Full integration: Two-step terminfo installation
if command -v infocmp >/dev/null 2>&1; then
echo "Installing Ghostty terminfo on remote host..." >&2
# Step 1: Install terminfo using the same approach that works manually
# This requires authentication but is quick and reliable
if infocmp -x xterm-ghostty 2>/dev/null | command ssh "$@" 'mkdir -p ~/.terminfo/x 2>/dev/null && tic -x -o ~/.terminfo /dev/stdin 2>/dev/null'; then
echo "Terminfo installed successfully. Connecting with full Ghostty support..." >&2
# Step 2: Connect with xterm-ghostty since we know terminfo is now available
local env_vars=()
# Use xterm-ghostty since we just installed it
env_vars+=("TERM=xterm-ghostty")
# Propagate Ghostty shell integration environment variables
[[ -n "$GHOSTTY_SHELL_FEATURES" ]] && env_vars+=("GHOSTTY_SHELL_FEATURES=$GHOSTTY_SHELL_FEATURES")
# Normal SSH connection with Ghostty terminfo available
env "${env_vars[@]}" ssh "$@"
return 0
else
echo "Terminfo installation failed. Using basic integration." >&2
fi
fi
# Full integration: Two-step terminfo installation
if builtin command -v infocmp >/dev/null 2>&1; then
echo "Installing Ghostty terminfo on remote host..." >&2
# Fallback to basic integration
_ghostty_ssh_basic "$@"
# Step 1: Install terminfo
if infocmp -x xterm-ghostty 2>/dev/null | builtin command ssh "$@" 'tic -x - 2>/dev/null'; then
echo "Terminfo installed successfully. Connecting with full Ghostty support..." >&2
# Step 2: Connect with xterm-ghostty since we know terminfo is now available
local env_vars=("TERM=xterm-ghostty")
# Propagate Ghostty shell integration environment variables
[[ -n "$GHOSTTY_SHELL_FEATURES" ]] && env_vars+=("GHOSTTY_SHELL_FEATURES=$GHOSTTY_SHELL_FEATURES")
# Normal SSH connection with Ghostty terminfo available
env "${env_vars[@]}" ssh "$@"
builtin return 0
fi
echo "Terminfo installation failed. Using basic integration." >&2
fi
# Fallback to basic integration
_ghostty_ssh_basic "$@"
}
fi
# Some zsh users manually run `source ~/.zshrc` in order to apply rc file