kevin/asdf
1
Fork 0
mirror of https://github.com/asdf-vm/asdf.git synced 2024-11-15 01:28:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use fish_add_path during fish setup if available (#1317)

Browse Source
This commit is contained in:
Yuri Pereira Constante 2022-08-30 15:18:25 +00:00 committed by GitHub
parent 733980f559
commit b8f6218bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
asdf.fish
View File

@ -2,18 +2,26 @@ if not set -q ASDF_DIR
set -x ASDF_DIR (dirname (status -f))
end
set -l asdf_user_shims (
# Add asdf to PATH
# fish_add_path was added in fish 3.2, so we need a fallback for older version
if type -q fish_add_path
if test -n "$ASDF_DATA_DIR"
fish_add_path --global --move "$ASDF_DATA_DIR/shims" "$ASDF_DIR/bin"
else
fish_add_path --global --move "$HOME/.asdf/shims" "$ASDF_DIR/bin"
end
else
set -l asdf_user_shims (
if test -n "$ASDF_DATA_DIR"
printf "%s\n" "$ASDF_DATA_DIR/shims"
else
printf "%s\n" "$HOME/.asdf/shims"
end
)
)
# Add asdf to PATH
set -l asdf_bin_dirs $ASDF_DIR/bin $asdf_user_shims
set -l asdf_bin_dirs $ASDF_DIR/bin $asdf_user_shims
for x in $asdf_bin_dirs
for x in $asdf_bin_dirs
if test -d $x
for i in (seq 1 (count $PATH))
if test $PATH[$i] = $x
@ -23,6 +31,7 @@ for x in $asdf_bin_dirs
end
end
set PATH $x $PATH
end
end
# Load the asdf wrapper function