superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zsh: move version check to ghostty-integration (#9781) 

The ghostty-integration script can be manually sourced, and it uses the
Zsh 5.1+ features, so that's a better place to guard against older Zsh
versions.

This also keeps the .zshenv script focused on just bootstrapping our
automatic shell integration.

I also changed the version check to a slightly more idiomatic pattern.
pull/9791/head
Mitchell Hashimoto 2025-12-02 11:12:49 -08:00 committed by GitHub
parent ac5f8c3a1e 6babcc97f5
commit edfae7e41e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shell-integration/README.md
View File

@ -88,3 +88,5 @@ if [[ -n $GHOSTTY_RESOURCES_DIR ]]; then
source "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration source "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration
fi fi
``` ```
Shell integration requires Zsh 5.1+.

5
src/shell-integration/zsh/.zshenv
View File

@ -43,11 +43,6 @@ fi
[[ ! -r "$_ghostty_file" ]] || 'builtin' 'source' '--' "$_ghostty_file" [[ ! -r "$_ghostty_file" ]] || 'builtin' 'source' '--' "$_ghostty_file"
} always { } always {
if [[ -o 'interactive' ]]; then if [[ -o 'interactive' ]]; then
'builtin' 'autoload' '--' 'is-at-least' 2>/dev/null && 'is-at-least' "5.1" || {
'builtin' 'echo' "zsh ${ZSH_VERSION} is too old for ghostty shell integration" >&2
'builtin' 'unset' '_ghostty_file'
return
}
# ${(%):-%x} is the path to the current file. # ${(%):-%x} is the path to the current file.
# On top of it we add :A:h to get the directory. # On top of it we add :A:h to get the directory.
'builtin' 'typeset' _ghostty_file="${${(%):-%x}:A:h}"/ghostty-integration 'builtin' 'typeset' _ghostty_file="${${(%):-%x}:A:h}"/ghostty-integration

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

@ -1,3 +1,5 @@
# vim:ft=zsh
#
# Based on (started as) a copy of Kitty's zsh integration. Kitty is # Based on (started as) a copy of Kitty's zsh integration. Kitty is
# distributed under GPLv3, so this file is also distributed under GPLv3. # distributed under GPLv3, so this file is also distributed under GPLv3.
# The license header is reproduced below: # The license header is reproduced below:
@ -41,6 +43,13 @@ _entrypoint() {
[[ -o interactive ]] || builtin return 0 # non-interactive shell [[ -o interactive ]] || builtin return 0 # non-interactive shell
(( ! $+_ghostty_state )) || builtin return 0 # already initialized (( ! $+_ghostty_state )) || builtin return 0 # already initialized
# We require zsh 5.1+ (released Sept 2015) for features like functions_source,
# introspection arrays, and array pattern substitution.
if ! { builtin autoload -- is-at-least 2>/dev/null && is-at-least 5.1; }; then
builtin echo "Zsh ${ZSH_VERSION} is too old for ghostty shell integration (5.1+ required)" >&2
builtin return 1
fi
# 0: no OSC 133 [AC] marks have been written yet. # 0: no OSC 133 [AC] marks have been written yet.
# 1: the last written OSC 133 C has not been closed with D yet. # 1: the last written OSC 133 C has not been closed with D yet.
# 2: none of the above. # 2: none of the above.