mirror of
https://github.com/nvm-sh/nvm.git
synced 2025-05-10 22:31:51 +00:00
parent
7b530edd3a
commit
3de459c32e
20
nvm.sh
20
nvm.sh
@ -338,16 +338,7 @@ nvm_tree_contains_path() {
|
||||
return 2
|
||||
fi
|
||||
|
||||
local previous_pathdir
|
||||
previous_pathdir="${node_path}"
|
||||
local pathdir
|
||||
pathdir=$(dirname "${previous_pathdir}")
|
||||
while [ "${pathdir}" != '' ] && [ "${pathdir}" != '.' ] && [ "${pathdir}" != '/' ] &&
|
||||
[ "${pathdir}" != "${tree}" ] && [ "${pathdir}" != "${previous_pathdir}" ]; do
|
||||
previous_pathdir="${pathdir}"
|
||||
pathdir=$(dirname "${previous_pathdir}")
|
||||
done
|
||||
[ "${pathdir}" = "${tree}" ]
|
||||
[ "$tree${node_path#$tree}" = "${node_path}" ]
|
||||
}
|
||||
|
||||
nvm_find_project_dir() {
|
||||
@ -1043,12 +1034,9 @@ nvm_ls_current() {
|
||||
nvm_add_iojs_prefix "$(iojs --version 2>/dev/null)"
|
||||
elif nvm_tree_contains_path "${NVM_DIR}" "${NVM_LS_CURRENT_NODE_PATH}"; then
|
||||
local VERSION
|
||||
VERSION="$(node --version 2>/dev/null)"
|
||||
if [ "${VERSION}" = "v0.6.21-pre" ]; then
|
||||
nvm_echo 'v0.6.21'
|
||||
else
|
||||
nvm_echo "${VERSION}"
|
||||
fi
|
||||
local VERSION_SUFFIX=${NVM_LS_CURRENT_NODE_PATH#$NVM_DIR/versions/node/}
|
||||
VERSION=${VERSION_SUFFIX%/bin/node}
|
||||
nvm_echo "${VERSION}"
|
||||
else
|
||||
nvm_echo 'system'
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user