CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-05-13 08:26:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix bash integration when 'set -o nounset' is in effect

Browse source 
If the user's bash profile contains 'set -u' / 'set -o nounset'
(to protect against typos in variable names; think "rm -Rf $TMp/*"),
starting a new kitty terminal resulted in a
    bash: sourced: unbound variable
message. Also, the error disabled kitty's shell integration.

This PR fixes/supersedes bba4ce22, which was based on an incorrect
assumption.
This commit is contained in:
Matthias Urlichs 2025-09-15 10:36:13 +02:00
parent 4afe56b808
commit 8335b340c9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell-integration/bash/kitty.bash
View file

@ -85,7 +85,7 @@ if [ "${BASH_VERSINFO:-0}" -lt 4 ]; then
builtin return builtin return
fi fi
if [[ "${_ksi_prompt[sourced]}" == "y" ]]; then if [ -v "_ksi_prompt[sourced]" ]; then
# we have already run # we have already run
builtin unset KITTY_SHELL_INTEGRATION builtin unset KITTY_SHELL_INTEGRATION
builtin return builtin return
@ -318,7 +318,7 @@ _ksi_main() {
builtin local venv="${VIRTUAL_ENV}/bin/activate" builtin local venv="${VIRTUAL_ENV}/bin/activate"
builtin local sourced="" builtin local sourced=""
_ksi_s_is_ok() { _ksi_s_is_ok() {
[[ -z "${sourced:-}" && "$KITTY_CLONE_SOURCE_STRATEGIES" == *",$1,"* ]] && builtin return 0 [[ -z "$sourced" && "$KITTY_CLONE_SOURCE_STRATEGIES" == *",$1,"* ]] && builtin return 0
builtin return 1 builtin return 1
} }