Skip to content

Commit

Permalink
fix!: do not remove items from PATH in POSIX entrypoint (#1521)
Browse files Browse the repository at this point in the history
  • Loading branch information
hyperupcall authored Mar 28, 2023
1 parent 6a6c539 commit b6d0ca2
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions asdf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if [ -z "$ASDF_DIR" ]; then
fi

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
fi

Expand All @@ -56,22 +56,20 @@ if [ ! -d "$ASDF_DIR" ]; then
return 1
fi

_asdf_bin="${ASDF_DIR}/bin"
_asdf_bin="$ASDF_DIR/bin"
_asdf_shims="${ASDF_DATA_DIR:-$HOME/.asdf}/shims"

# shellcheck disable=SC3060
if [ -n "$BASH_VERSION" ] || [ -n "$ZSH_VERSION" ]; then
case ":$PATH:" in
*":${_asdf_bin}:"*) PATH="${PATH//$_asdf_bin:/}" ;;
esac
case ":$PATH:" in
*":${_asdf_shims}:"*) PATH="${PATH//$_asdf_shims:/}" ;;
esac
fi
case ":$PATH:" in
*":$_asdf_bin:"*) : ;;
*) PATH="$_asdf_bin:$PATH" ;;
esac
case ":$PATH:" in
*":$_asdf_shims:"*) : ;;
*) PATH="$_asdf_shims:$PATH" ;;
esac

PATH="${_asdf_bin}:${_asdf_shims}:$PATH"
unset -v _asdf_bin _asdf_shims

# shellcheck source=lib/asdf.sh
. "${ASDF_DIR}/lib/asdf.sh"
. "$ASDF_DIR/lib/asdf.sh"

0 comments on commit b6d0ca2

Please sign in to comment.