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

fix!: do not remove items from PATH in POSIX entrypoint (#1521)

Browse Source
This commit is contained in:
Edwin Kofler 2023-03-27 23:42:55 -07:00 committed by GitHub
parent 6a6c539f4a
commit b6d0ca28d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asdf.sh
View File

@ -47,7 +47,7 @@ if [ -z "$ASDF_DIR" ]; then
fi fi
if [ -z "$ASDF_DIR" ]; then if [ -z "$ASDF_DIR" ]; then
printf "%s\n" "asdf: Error: Source directory could not be calculated. Please set it manually before sourcing this file." >&2 printf "%s\n" "asdf: Error: Source directory could not be calculated. Please set \$ASDF_DIR manually before sourcing this file." >&2
return 1 return 1
fi fi
@ -56,22 +56,20 @@ if [ ! -d "$ASDF_DIR" ]; then
return 1 return 1
fi fi
_asdf_bin="${ASDF_DIR}/bin" _asdf_bin="$ASDF_DIR/bin"
_asdf_shims="${ASDF_DATA_DIR:-$HOME/.asdf}/shims" _asdf_shims="${ASDF_DATA_DIR:-$HOME/.asdf}/shims"
# shellcheck disable=SC3060 case ":$PATH:" in
if [ -n "$BASH_VERSION" ] || [ -n "$ZSH_VERSION" ]; then *":$_asdf_bin:"*) : ;;
case ":$PATH:" in *) PATH="$_asdf_bin:$PATH" ;;
*":${_asdf_bin}:"*) PATH="${PATH//$_asdf_bin:/}" ;; esac
esac case ":$PATH:" in
case ":$PATH:" in *":$_asdf_shims:"*) : ;;
*":${_asdf_shims}:"*) PATH="${PATH//$_asdf_shims:/}" ;; *) PATH="$_asdf_shims:$PATH" ;;
esac esac
fi
PATH="${_asdf_bin}:${_asdf_shims}:$PATH"
unset -v _asdf_bin _asdf_shims unset -v _asdf_bin _asdf_shims
# shellcheck source=lib/asdf.sh # shellcheck source=lib/asdf.sh
. "${ASDF_DIR}/lib/asdf.sh" . "$ASDF_DIR/lib/asdf.sh"