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

Only alias sudo if no systemwide terminfo db for xterm-kitty is found

Browse source
This commit is contained in:
Kovid Goyal 2023-11-03 12:30:29 +05:30
parent a54586dfa9
commit 2aa37de6ff
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ if [[ -n "$KITTY_BASH_INJECT" ]]; then
[[ -f "$1" && -r "$1" ]] && builtin return 0; builtin return 1;
}
if [[ -n "$ksi_val" && "$ksi_val" != *no-sudo* ]]; then
if [[ -n "$ksi_val" && "$ksi_val" != *no-sudo* && -n "$TERMINFO" && ! ( -r "/usr/share/terminfo/x/xterm-kitty" || -r "/usr/share/terminfo/78/xterm-kitty" ) ]]; then
# this must be done before sourcing user bashrc otherwise aliasing of sudo does not work
sudo() {
# Ensure terminfo is available in sudo
@ -28,7 +28,7 @@ if [[ -n "$KITTY_BASH_INJECT" ]]; then
fi
[[ "$arg" != -* && "$arg" != *=* ]] && builtin break # command found
done
if [[ -z "$TERMINFO" || "$is_sudoedit" == "y" ]]; then
if [[ "$is_sudoedit" == "y" ]]; then
builtin command sudo "$@";
else
builtin command sudo TERMINFO="$TERMINFO" "$@";

1
shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
View file

@ -112,6 +112,7 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after
# for sudo it will be clobbered by us, so only install this if sudo is not already function
if not contains "no-sudo" $_ksi
and test -n "$TERMINFO" -a "file" = (type -t sudo)
and not test -r "/usr/share/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/78/xterm-kitty"
# Ensure terminfo is available in sudo
function sudo
set --local is_sudoedit "n"

34
shell-integration/zsh/kitty-integration
View file

@ -388,23 +388,25 @@ _ksi_deferred_init() {
builtin alias edit-in-kitty="kitten edit-in-kitty"
if (( ! opt[(Ie)no-sudo] )); then
sudo() {
# Ensure terminfo is available in sudo
builtin local is_sudoedit="n"
for arg; do
if [[ "$arg" == "-e" || $arg == "--edit" ]]; then
is_sudoedit="y"
builtin break;
if (( ! opt[(Ie)no-sudo] )) ; then
if [[ -n "$TERMINFO" && ! ( -r "/usr/share/terminfo/x/xterm-kitty" || -r "/usr/share/terminfo/78/xterm-kitty" ) ]]; then
sudo() {
# Ensure terminfo is available in sudo
builtin local is_sudoedit="n"
for arg; do
if [[ "$arg" == "-e" || $arg == "--edit" ]]; then
is_sudoedit="y"
builtin break;
fi
[[ "$arg" != -* && "$arg" != *=* ]] && builtin break # command found
done
if [[ "$is_sudoedit" == "y" ]]; then
builtin command sudo "$@";
else
builtin command sudo TERMINFO="$TERMINFO" "$@";
fi
[[ "$arg" != -* && "$arg" != *=* ]] && builtin break # command found
done
if [[ -z "$TERMINFO" || "$is_sudoedit" == "y" ]]; then
builtin command sudo "$@";
else
builtin command sudo TERMINFO="$TERMINFO" "$@";
fi
}
}
fi
fi
# Map alt+left/right to move by word if not already mapped. This is expected behavior on macOS and I am tired