Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Deduplicate $fish_user_paths automatically

Browse source 
In the variable handler, we just go through the entire thing and keep
every element once.

If there's a duplicate, we set it again, which calls the handler
again.

This takes a bit of time, to be paid on each startup. On my system,
with 100 already deduplicated elements, that's about 4ms (compared to
~17ms for adding them to $PATH).

It's also semantically more complicated - now this variable
specifically is deduplicated? Do we just want "unique" variables that
can't have duplicates?

However: This entirely removes the pathological case of appending to
$fish_user_paths in config.fish (which should be an FAQ entry!), and the implementation is quite simple.
This commit is contained in:
Fabian Homborg 2021-07-05 19:09:40 +02:00
parent 405ef31f72
commit e013422143
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
share/config.fish
View file

@ -98,6 +98,21 @@ end
# Add a handler for when fish_user_path changes, so we can apply the same changes to PATH # Add a handler for when fish_user_path changes, so we can apply the same changes to PATH
function __fish_reconstruct_path -d "Update PATH when fish_user_paths changes" --on-variable fish_user_paths function __fish_reconstruct_path -d "Update PATH when fish_user_paths changes" --on-variable fish_user_paths
# Deduplicate $fish_user_paths
# This should help with people appending to it in config.fish
set -l new_user_path
for path in (string split : -- $fish_user_paths)
if not contains -- $path $new_user_path
set -a new_user_path $path
end
end
if test (count $new_user_path) -lt (count $fish_user_paths)
# This will end up calling us again, so we return
set fish_user_paths $new_user_path
return
end
set -l local_path $PATH set -l local_path $PATH
for x in $__fish_added_user_paths for x in $__fish_added_user_paths

36
tests/checks/fish_user_paths.fish Normal file
View file

@ -0,0 +1,36 @@
# RUN: %fish %s
#
# This deals with $PATH manipulation. We need to be careful not to step on anything.
set -l tmpdir (mktemp -d)
mkdir $tmpdir/bin
mkdir $tmpdir/sbin
mkdir $tmpdir/etc
ln -s $tmpdir/bin $tmpdir/link
# We set fish_user_paths to an empty global to have a starting point
set -g fish_user_paths
set fish_user_paths $tmpdir/bin
# Confirm that it actually ends up in $PATH
contains -- (builtin realpath $tmpdir/bin) $PATH
and echo Have bin
# CHECK: Have bin
# Not adding duplicates
set PATH $PATH
set -l --path oldpath $PATH
set -a fish_user_paths $tmpdir/bin
test "$oldpath" = "$PATH"
or begin
echo OH NO A DUPLICATE
echo NEW: $PATH
echo OLD: $oldpath
end
# Add a link to the same path.
set -a fish_user_paths $tmpdir/link
contains -- $tmpdir/link $PATH
and echo Have bin
# CHECK: Have bin