mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4964

Browse Source
This commit is contained in:
Kovid Goyal
2022-04-14 17:20:30 +05:30
parent d9899cb489
commit 829ed0ec0d
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.rst
View File

@@ -45,6 +45,8 @@ Detailed list of changes
- Allow using the cwd of the oldest as well as the newest foreground process for :option:`launch --cwd` (:disc:`4869`) - Allow using the cwd of the oldest as well as the newest foreground process for :option:`launch --cwd` (:disc:`4869`)
- Bash integration: Fix the value of :opt:`shell_integration` not taking effect if the integration script is sourced in bashrc (:pull:`4964`)
0.25.0 [2022-04-11] 0.25.0 [2022-04-11]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

3
shell-integration/bash/kitty.bash
View File

@@ -7,6 +7,8 @@ _ksi_inject() {
# Load the normal bash startup files # Load the normal bash startup files
if [[ -n "$KITTY_BASH_INJECT" ]]; then if [[ -n "$KITTY_BASH_INJECT" ]]; then
builtin local kitty_bash_inject="$KITTY_BASH_INJECT" builtin local kitty_bash_inject="$KITTY_BASH_INJECT"
builtin local ksi_val="$KITTY_SHELL_INTEGRATION"
builtin unset KITTY_SHELL_INTEGRATION # ensure manual sourcing of this file in bashrc does not have any effect
builtin unset KITTY_BASH_INJECT builtin unset KITTY_BASH_INJECT
builtin unset ENV builtin unset ENV
if [[ -z "$HOME" ]]; then HOME=~; fi if [[ -z "$HOME" ]]; then HOME=~; fi
@@ -52,6 +54,7 @@ _ksi_inject() {
builtin unset KITTY_BASH_POSIX_ENV builtin unset KITTY_BASH_POSIX_ENV
builtin unset KITTY_BASH_ETC_LOCATION builtin unset KITTY_BASH_ETC_LOCATION
builtin unset -f _ksi_safe_source builtin unset -f _ksi_safe_source
export KITTY_SHELL_INTEGRATION="$ksi_val"
fi fi
} }
_ksi_inject _ksi_inject