ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-05-10 14:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Robustness] handle an overridden type

Browse Source 
Fixes #2352
This commit is contained in:
Jordan Harband 2020-11-21 13:33:12 -08:00
parent b19d8dbbba
commit c8d70e07b7
No known key found for this signature in database
GPG Key ID: 9F6A681E35EF8B56
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nvm.sh
View File

@ -45,7 +45,7 @@ nvm_grep() {
} }
nvm_has() { nvm_has() {
type "${1-}" >/dev/null 2>&1 command type "${1-}" >/dev/null 2>&1
} }
nvm_has_non_aliased() { nvm_has_non_aliased() {
@ -61,18 +61,18 @@ nvm_command_info() {
local COMMAND local COMMAND
local INFO local INFO
COMMAND="${1}" COMMAND="${1}"
if type "${COMMAND}" | nvm_grep -q hashed; then if command type "${COMMAND}" | nvm_grep -q hashed; then
INFO="$(type "${COMMAND}" | command sed -E 's/\(|\)//g' | command awk '{print $4}')" INFO="$(command type "${COMMAND}" | command sed -E 's/\(|\)//g' | command awk '{print $4}')"
elif type "${COMMAND}" | nvm_grep -q aliased; then elif command type "${COMMAND}" | nvm_grep -q aliased; then
# shellcheck disable=SC2230 # shellcheck disable=SC2230
INFO="$(which "${COMMAND}") ($(type "${COMMAND}" | command awk '{ $1=$2=$3=$4="" ;print }' | command sed -e 's/^\ *//g' -Ee "s/\`|'//g"))" INFO="$(which "${COMMAND}") ($(command type "${COMMAND}" | command awk '{ $1=$2=$3=$4="" ;print }' | command sed -e 's/^\ *//g' -Ee "s/\`|'//g"))"
elif type "${COMMAND}" | nvm_grep -q "^${COMMAND} is an alias for"; then elif command type "${COMMAND}" | nvm_grep -q "^${COMMAND} is an alias for"; then
# shellcheck disable=SC2230 # shellcheck disable=SC2230
INFO="$(which "${COMMAND}") ($(type "${COMMAND}" | command awk '{ $1=$2=$3=$4=$5="" ;print }' | command sed 's/^\ *//g'))" INFO="$(which "${COMMAND}") ($(command type "${COMMAND}" | command awk '{ $1=$2=$3=$4=$5="" ;print }' | command sed 's/^\ *//g'))"
elif type "${COMMAND}" | nvm_grep -q "^${COMMAND} is \\/"; then elif command type "${COMMAND}" | nvm_grep -q "^${COMMAND} is \\/"; then
INFO="$(type "${COMMAND}" | command awk '{print $3}')" INFO="$(command type "${COMMAND}" | command awk '{print $3}')"
else else
INFO="$(type "${COMMAND}")" INFO="$(command type "${COMMAND}")"
fi fi
nvm_echo "${INFO}" nvm_echo "${INFO}"
} }