KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix previous PR breaking bash integration

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-23 12:30:02 +05:30
parent de10dfe91b
commit 27f3a5e16a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,8 @@ _ksi_main() {
_ksi_debug_print() { _ksi_debug_print() {
# print a line to STDOUT of parent kitty process # print a line to STDOUT of parent kitty process
builtin local b=$(builtin command base64 <<< "${@}") builtin local b
b=$(builtin command base64 <<< "${@}")
builtin printf "\eP@kitty-print|%s\e\\" "${b//\\n}" builtin printf "\eP@kitty-print|%s\e\\" "${b//\\n}"
} }
@ -98,7 +99,8 @@ _ksi_main() {
fi fi
if [[ -n "${_ksi_prompt[ps1]}" ]]; then if [[ -n "${_ksi_prompt[ps1]}" ]]; then
if [[ "${_ksi_prompt[mark]}" == "y" && ( "${PS1}" == *"\n"* || "${PS1}" == *$'\n'* ) ]]; then if [[ "${_ksi_prompt[mark]}" == "y" && ( "${PS1}" == *"\n"* || "${PS1}" == *$'\n'* ) ]]; then
builtin local oldval=$(builtin shopt -p extglob) builtin local oldval
oldval=$(builtin shopt -p extglob)
builtin shopt -s extglob builtin shopt -s extglob
# bash does not redraw the leading lines in a multiline prompt so # bash does not redraw the leading lines in a multiline prompt so
# mark the last line as a secondary prompt. Otherwise on resize the # mark the last line as a secondary prompt. Otherwise on resize the
@ -133,7 +135,8 @@ _ksi_main() {
_ksi_debug_print "ignoreboth or ignorespace present in bash HISTCONTROL setting, showing running command in window title will not be robust" _ksi_debug_print "ignoreboth or ignorespace present in bash HISTCONTROL setting, showing running command in window title will not be robust"
fi fi
_ksi_get_current_command() { _ksi_get_current_command() {
builtin local last_cmd=$(HISTTIMEFORMAT= builtin history 1) builtin local last_cmd
last_cmd=$(HISTTIMEFORMAT= builtin history 1)
last_cmd="${last_cmd#*[[:digit:]]*[[:space:]]}" # remove leading history number last_cmd="${last_cmd#*[[:digit:]]*[[:space:]]}" # remove leading history number
last_cmd="${last_cmd#"${last_cmd%%[![:space:]]*}"}" # remove remaining leading whitespace last_cmd="${last_cmd#"${last_cmd%%[![:space:]]*}"}" # remove remaining leading whitespace
builtin printf "\e]2;%s\a" "${last_cmd}" builtin printf "\e]2;%s\a" "${last_cmd}"
@ -189,7 +192,8 @@ _ksi_main() {
# otherwise append a string. We check if _ksi_prompt_command exists as some shell # otherwise append a string. We check if _ksi_prompt_command exists as some shell
# scripts stupidly export PROMPT_COMMAND making it inherited by all programs launched # scripts stupidly export PROMPT_COMMAND making it inherited by all programs launched
# from the shell # from the shell
builtin local pc='builtin declare -F _ksi_prompt_command > /dev/null 2> /dev/null && _ksi_prompt_command' builtin local pc
pc='builtin declare -F _ksi_prompt_command > /dev/null 2> /dev/null && _ksi_prompt_command'
if [[ -z "${PROMPT_COMMAND}" ]]; then if [[ -z "${PROMPT_COMMAND}" ]]; then
PROMPT_COMMAND=([0]="$pc") PROMPT_COMMAND=([0]="$pc")
elif [[ $(builtin declare -p PROMPT_COMMAND 2> /dev/null) =~ 'declare -a PROMPT_COMMAND' ]]; then elif [[ $(builtin declare -p PROMPT_COMMAND 2> /dev/null) =~ 'declare -a PROMPT_COMMAND' ]]; then