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

Remove trailing spaces

Browse Source
This commit is contained in:
pagedown 2022-02-23 13:59:39 +08:00
parent fc9645832d
commit 393425e3d1
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,14 +21,14 @@ _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=$(command base64 <<< "${@}" | tr -d \\n) builtin local b=$(command base64 <<< "${@}" | tr -d \\n)
builtin printf "\eP@kitty-print|%s\e\\" "$b" builtin printf "\eP@kitty-print|%s\e\\" "$b"
# " # "
} }
_ksi_safe_source() { _ksi_safe_source() {
if [[ -f "$1" && -r "$1" ]]; then if [[ -f "$1" && -r "$1" ]]; then
builtin source "$1"; builtin source "$1";
builtin return 0; builtin return 0;
fi fi
builtin return 1; builtin return 1;
} }
@ -37,15 +37,15 @@ _ksi_main() {
builtin unset ENV; builtin unset ENV;
if [[ -z "$HOME" ]]; then HOME=~; fi if [[ -z "$HOME" ]]; then HOME=~; fi
if [[ -z "$KITTY_BASH_ETC_LOCATION" ]]; then KITTY_BASH_ETC_LOCATION="/etc"; fi if [[ -z "$KITTY_BASH_ETC_LOCATION" ]]; then KITTY_BASH_ETC_LOCATION="/etc"; fi
if [[ "$KITTY_BASH_INJECT" == *"posix"* ]]; then if [[ "$KITTY_BASH_INJECT" == *"posix"* ]]; then
_ksi_safe_source "$KITTY_BASH_POSIX_ENV" && builtin export ENV="$KITTY_BASH_POSIX_ENV"; _ksi_safe_source "$KITTY_BASH_POSIX_ENV" && builtin export ENV="$KITTY_BASH_POSIX_ENV";
else else
set +o posix; set +o posix;
# See run_startup_files() in shell.c in the BASH source code # See run_startup_files() in shell.c in the BASH source code
if builtin shopt -q login_shell; then if builtin shopt -q login_shell; then
if [[ "$KITTY_BASH_INJECT" != *"no-profile"* ]]; then if [[ "$KITTY_BASH_INJECT" != *"no-profile"* ]]; then
_ksi_safe_source "$KITTY_BASH_ETC_LOCATION/profile"; _ksi_safe_source "$KITTY_BASH_ETC_LOCATION/profile";
_ksi_safe_source "$HOME/.bash_profile" || _ksi_safe_source "$HOME/.bash_login" || _ksi_safe_source "$HOME/.profile"; _ksi_safe_source "$HOME/.bash_profile" || _ksi_safe_source "$HOME/.bash_login" || _ksi_safe_source "$HOME/.profile";
fi fi
else else
if [[ "$KITTY_BASH_INJECT" != *"no-rc"* ]]; then if [[ "$KITTY_BASH_INJECT" != *"no-rc"* ]]; then
@ -65,8 +65,8 @@ _ksi_main() {
fi fi
builtin unset -f _ksi_safe_source builtin unset -f _ksi_safe_source
_ksi_set_mark() { _ksi_set_mark() {
_ksi_prompt["${1}_mark"]="\[\e]133;k;${1}_kitty\a\]" _ksi_prompt["${1}_mark"]="\[\e]133;k;${1}_kitty\a\]"
} }
_ksi_set_mark start _ksi_set_mark start
@ -105,7 +105,7 @@ _ksi_main() {
# mark the last line as a secondary prompt. Otherwise on resize the # mark the last line as a secondary prompt. Otherwise on resize the
# lines before the last line will be erased by kitty. # lines before the last line will be erased by kitty.
# the first part removes everything from the last \n onwards # the first part removes everything from the last \n onwards
# the second part appends a newline with the secondary marking # the second part appends a newline with the secondary marking
# the third part appends everything after the last newline # the third part appends everything after the last newline
PS1=${PS1%@('\n'|$'\n')*}${_ksi_prompt[secondary_prompt]}${PS1##*@('\n'|$'\n')}; PS1=${PS1%@('\n'|$'\n')*}${_ksi_prompt[secondary_prompt]}${PS1##*@('\n'|$'\n')};
eval "$oldval" eval "$oldval"
@ -121,12 +121,12 @@ _ksi_main() {
fi fi
} }
if [[ "${_ksi_prompt[cursor]}" == "y" ]]; then if [[ "${_ksi_prompt[cursor]}" == "y" ]]; then
_ksi_prompt[ps1_suffix]+="\[\e[5 q\]" # blinking bar cursor _ksi_prompt[ps1_suffix]+="\[\e[5 q\]" # blinking bar cursor
_ksi_prompt[ps0_suffix]+="\[\e[0 q\]" # blinking default cursor _ksi_prompt[ps0_suffix]+="\[\e[0 q\]" # blinking default cursor
fi fi
if [[ "${_ksi_prompt[title]}" == "y" ]]; then if [[ "${_ksi_prompt[title]}" == "y" ]]; then
# see https://www.gnu.org/software/bash/manual/html_node/Controlling-the-Prompt.html#Controlling-the-Prompt # see https://www.gnu.org/software/bash/manual/html_node/Controlling-the-Prompt.html#Controlling-the-Prompt
# we use suffix here because some distros add title setting to their bashrc files by default # we use suffix here because some distros add title setting to their bashrc files by default
_ksi_prompt[ps1_suffix]+="\[\e]2;\w\a\]" _ksi_prompt[ps1_suffix]+="\[\e]2;\w\a\]"
@ -142,13 +142,13 @@ _ksi_main() {
_ksi_prompt[ps0_suffix]+='$(_ksi_get_current_command)' _ksi_prompt[ps0_suffix]+='$(_ksi_get_current_command)'
fi fi
if [[ "${_ksi_prompt[mark]}" == "y" ]]; then if [[ "${_ksi_prompt[mark]}" == "y" ]]; then
_ksi_prompt[ps1]+="\[\e]133;A\a\]" _ksi_prompt[ps1]+="\[\e]133;A\a\]"
_ksi_prompt[ps2]+="\[\e]133;A;k=s\a\]" _ksi_prompt[ps2]+="\[\e]133;A;k=s\a\]"
_ksi_prompt[ps0]+="\[\e]133;C\a\]" _ksi_prompt[ps0]+="\[\e]133;C\a\]"
fi fi
if [[ "${_ksi_prompt[complete]}" == "y" ]]; then if [[ "${_ksi_prompt[complete]}" == "y" ]]; then
_ksi_completions() { _ksi_completions() {
builtin local src builtin local src
builtin local limit builtin local limit
@ -164,19 +164,19 @@ _ksi_main() {
# wrap our prompt additions in markers we can use to remove them using # wrap our prompt additions in markers we can use to remove them using
# bash's anemic pattern substitution # bash's anemic pattern substitution
if [[ -n "${_ksi_prompt[ps0]}" ]]; then if [[ -n "${_ksi_prompt[ps0]}" ]]; then
_ksi_prompt[ps0]="${_ksi_prompt[start_mark]}${_ksi_prompt[ps0]}${_ksi_prompt[end_mark]}" _ksi_prompt[ps0]="${_ksi_prompt[start_mark]}${_ksi_prompt[ps0]}${_ksi_prompt[end_mark]}"
fi fi
if [[ -n "${_ksi_prompt[ps0_suffix]}" ]]; then if [[ -n "${_ksi_prompt[ps0_suffix]}" ]]; then
_ksi_prompt[ps0_suffix]="${_ksi_prompt[start_suffix_mark]}${_ksi_prompt[ps0_suffix]}${_ksi_prompt[end_suffix_mark]}" _ksi_prompt[ps0_suffix]="${_ksi_prompt[start_suffix_mark]}${_ksi_prompt[ps0_suffix]}${_ksi_prompt[end_suffix_mark]}"
fi fi
if [[ -n "${_ksi_prompt[ps1]}" ]]; then if [[ -n "${_ksi_prompt[ps1]}" ]]; then
_ksi_prompt[ps1]="${_ksi_prompt[start_mark]}${_ksi_prompt[ps1]}${_ksi_prompt[end_mark]}" _ksi_prompt[ps1]="${_ksi_prompt[start_mark]}${_ksi_prompt[ps1]}${_ksi_prompt[end_mark]}"
fi fi
if [[ -n "${_ksi_prompt[ps1_suffix]}" ]]; then if [[ -n "${_ksi_prompt[ps1_suffix]}" ]]; then
_ksi_prompt[ps1_suffix]="${_ksi_prompt[start_suffix_mark]}${_ksi_prompt[ps1_suffix]}${_ksi_prompt[end_suffix_mark]}" _ksi_prompt[ps1_suffix]="${_ksi_prompt[start_suffix_mark]}${_ksi_prompt[ps1_suffix]}${_ksi_prompt[end_suffix_mark]}"
fi fi
if [[ -n "${_ksi_prompt[ps2]}" ]]; then if [[ -n "${_ksi_prompt[ps2]}" ]]; then
_ksi_prompt[ps2]="${_ksi_prompt[start_mark]}${_ksi_prompt[ps2]}${_ksi_prompt[end_mark]}" _ksi_prompt[ps2]="${_ksi_prompt[start_mark]}${_ksi_prompt[ps2]}${_ksi_prompt[end_mark]}"
fi fi
builtin unset _ksi_prompt[start_mark] builtin unset _ksi_prompt[start_mark]