mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 03:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

clone-in-kitty: Remove duplicate PATH entries in fish implementation

Browse Source
This commit is contained in:
pagedown
2022-04-18 11:46:29 +08:00
parent 9e026983e6
commit 45eb4a0760
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
View File

@@ -24,7 +24,6 @@ not functions -q __ksi_schedule || exit 0
set -q fish_killring || set -q status_generation || string match -qnv "3.1.*" "$version" set -q fish_killring || set -q status_generation || string match -qnv "3.1.*" "$version"
or echo -en \eP@kitty-print\|V2FybmluZzogVXBkYXRlIGZpc2ggdG8gdmVyc2lvbiAzLjMuMCsgdG8gZW5hYmxlIGtpdHR5IHNoZWxsIGludGVncmF0aW9uLgo=\e\\ && exit 0 || exit 0 or echo -en \eP@kitty-print\|V2FybmluZzogVXBkYXRlIGZpc2ggdG8gdmVyc2lvbiAzLjMuMCsgdG8gZW5hYmxlIGtpdHR5IHNoZWxsIGludGVncmF0aW9uLgo=\e\\ && exit 0 || exit 0
function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after other scripts have run, we hope" function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after other scripts have run, we hope"
functions --erase __ksi_schedule functions --erase __ksi_schedule
test -n "$KITTY_SHELL_INTEGRATION" || return 0 test -n "$KITTY_SHELL_INTEGRATION" || return 0
@@ -110,15 +109,14 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after
# Handle clone launches # Handle clone launches
if test -n "$KITTY_IS_CLONE_LAUNCH" if test -n "$KITTY_IS_CLONE_LAUNCH"
set -l orig_conda_env "$CONDA_DEFAULT_ENV" set --local orig_conda_env "$CONDA_DEFAULT_ENV"
eval "$KITTY_IS_CLONE_LAUNCH" eval "$KITTY_IS_CLONE_LAUNCH"
set -l venv "$VIRTUAL_ENV/bin/activate.fish" set --local venv "$VIRTUAL_ENV/bin/activate.fish"
set -g _ksi_sourced 'n' set --global _ksi_sourced
function _ksi_s_is_ok function _ksi_s_is_ok
if test "$_ksi_sourced" = 'n' test -z "$_ksi_sourced"
and string match -q -- "*,$argv[1],*" "$KITTY_CLONE_SOURCE_STRATEGIES" and string match -q -- "*,$argv[1],*" "$KITTY_CLONE_SOURCE_STRATEGIES"
return 0 and return 0
end
return 1 return 1
end end
if _ksi_s_is_ok "venv" if _ksi_s_is_ok "venv"
@@ -128,9 +126,8 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after
source "$venv" source "$venv"
end end
if _ksi_s_is_ok "conda" if _ksi_s_is_ok "conda"
and test -n "$CONDA_DEFAULT_ENV" and test -n "$CONDA_DEFAULT_ENV" -a "$CONDA_DEFAULT_ENV" != "$orig_conda_env"
and type -q conda and functions -q conda
and test "$CONDA_DEFAULT_ENV" != "$orig_conda_env"
set _ksi_sourced "y" set _ksi_sourced "y"
conda activate "$CONDA_DEFAULT_ENV" conda activate "$CONDA_DEFAULT_ENV"
end end
@@ -146,6 +143,15 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after
end end
set --erase KITTY_IS_CLONE_LAUNCH KITTY_CLONE_SOURCE_STRATEGIES _ksi_sourced set --erase KITTY_IS_CLONE_LAUNCH KITTY_CLONE_SOURCE_STRATEGIES _ksi_sourced
functions --erase _ksi_s_is_ok functions --erase _ksi_s_is_ok
# Ensure PATH has no duplicate entries
set --local --path new_path
for p in $PATH
contains -- "$p" $new_path
or set --append new_path "$p"
end
test (count $new_path) -eq (count $PATH)
or set --global --export --path PATH $new_path
end end
end end
@@ -165,9 +171,9 @@ function clone-in-kitty -d "Clone the current fish session into a new kitty wind
for e in (set --export --names) for e in (set --export --names)
set --append envs "$e=$$e" set --append envs "$e=$$e"
end end
set --local b64_envs (string join0 $envs | base64) set --local b64_envs (string join0 -- $envs | base64)
set --local b64_cwd (printf "%s" "$PWD" | base64) set --local b64_cwd (printf "%s" "$PWD" | base64)
set --prepend data "shell=fish,pid=$fish_pid" "cwd=$b64_cwd" "env=$b64_envs" set --prepend data "shell=fish" "pid=$fish_pid" "cwd=$b64_cwd" "env=$b64_envs"
set data (string join "," -- $data | tr -d "\t\n\r ") set data (string join "," -- $data | tr -d "\t\n\r ")
set --local data_len (string length -- "$data") set --local data_len (string length -- "$data")
set --local pos 1 set --local pos 1