Fix user shims stored now in ASDF_DATA_DIR

This commit is contained in:
Jose Luis Salas 2018-09-24 17:47:49 +02:00
parent 266e3cffa5
commit 0a9cd676f4
No known key found for this signature in database
GPG Key ID: A1F04DD6AC8B7D04

View File

@ -17,13 +17,14 @@ ASDF_DIR="$(dirname "$current_script_path")"
# replace all occurrences - ${parameter//pattern/string} # replace all occurrences - ${parameter//pattern/string}
ASDF_BIN="${ASDF_DIR}/bin" ASDF_BIN="${ASDF_DIR}/bin"
ASDF_SHIMS="${ASDF_DIR}/shims" ASDF_SHIMS="${ASDF_DIR}/shims"
ASDF_USER_SHIMS="${ASDF_DATA_DIR:-$HOME/.asdf}" ASDF_USER_SHIMS="${ASDF_DATA_DIR:-$HOME/.asdf}/shims"
[[ ":$PATH:" == *":${ASDF_BIN}:"* ]] && PATH="${PATH//$ASDF_BIN:/}" [[ ":$PATH:" == *":${ASDF_BIN}:"* ]] && PATH="${PATH//$ASDF_BIN:/}"
[[ ":$PATH:" == *":${ASDF_SHIMS}:"* ]] && PATH="${PATH//$ASDF_SHIMS:/}" [[ ":$PATH:" == *":${ASDF_SHIMS}:"* ]] && PATH="${PATH//$ASDF_SHIMS:/}"
[[ ":$PATH:" == *":${ASDF_USER_SHIMS}:"* ]] && PATH="${PATH//$ASDF_USER_SHIMS:/}" [[ ":$PATH:" == *":${ASDF_USER_SHIMS}:"* ]] && PATH="${PATH//$ASDF_USER_SHIMS:/}"
# add to front of $PATH # add to front of $PATH
PATH="${ASDF_BIN}:$PATH" PATH="${ASDF_BIN}:$PATH"
PATH="${ASDF_SHIMS}:$PATH" PATH="${ASDF_SHIMS}:$PATH"
PATH="${ASDF_USER_SHIMS}:$PATH"
if [ -n "$ZSH_VERSION" ]; then if [ -n "$ZSH_VERSION" ]; then
autoload -U bashcompinit autoload -U bashcompinit