From 7e1580ef0906e454b0738c5ee8b949dd446c2e83 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 31 Oct 2023 16:49:15 +0530 Subject: [PATCH] fish integration: Dont clobber user defined sudo function --- .../fish/vendor_conf.d/kitty-shell-integration.fish | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish index 91d192ab1..c51b71a44 100644 --- a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish +++ b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish @@ -108,9 +108,10 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after __update_cwd_osc end - if not contains "no-sudo" $_ksi and test -n "$TERMINFO" - # Note that neither alias nor function is recursive in fish so if the user defines an alias/function - # for sudo it will clobber us + # Note that neither alias nor function is recursive in fish so if the user defines an alias/function + # for sudo it will be clobbered by us, so only install this is sudo is not already function + if not contains "no-sudo" $_ksi + and test -n "$TERMINFO" -a "file" = (type -t sudo) # Ensure terminfo is available in sudo function sudo set --local is_sudoedit "n"