ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-05-13 07:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 869b273c77 into ab49a5b0c3

Browse Source
This commit is contained in:
Adam Brunnmeier 2016-05-05 03:42:49 +00:00
commit 7693a611c3
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nvm.sh
View File

@ -1534,13 +1534,15 @@ nvm_die_on_prefix() {
return return
fi fi
check_prefix() {
local NVM_NPM_PREFIX local NVM_NPM_PREFIX
NVM_NPM_PREFIX="$(NPM_CONFIG_LOGLEVEL=warn npm config get prefix)" NVM_NPM_PREFIX="$(NPM_CONFIG_LOGLEVEL=warn npm config get prefix 2>&1)"
if ! (nvm_tree_contains_path "$NVM_DIR" "$NVM_NPM_PREFIX" >/dev/null 2>&1); then if ! (nvm_tree_contains_path "$NVM_DIR" "$NVM_NPM_PREFIX" >/dev/null 2>&1); then
if [ "_$NVM_DELETE_PREFIX" = "_1" ]; then if [ "_$NVM_DELETE_PREFIX" = "_1" ]; then
NPM_CONFIG_LOGLEVEL=warn npm config delete prefix NPM_CONFIG_LOGLEVEL=warn npm config delete prefix
else else
nvm deactivate >/dev/null 2>&1 nvm deactivate >/dev/null 2>&1
echo >&2 ""
echo >&2 "nvm is not compatible with the npm config \"prefix\" option: currently set to \"$NVM_NPM_PREFIX\"" echo >&2 "nvm is not compatible with the npm config \"prefix\" option: currently set to \"$NVM_NPM_PREFIX\""
if nvm_has 'npm'; then if nvm_has 'npm'; then
echo >&2 "Run \`npm config delete prefix\` or \`$NVM_COMMAND\` to unset it." echo >&2 "Run \`npm config delete prefix\` or \`$NVM_COMMAND\` to unset it."
@ -1550,6 +1552,8 @@ nvm_die_on_prefix() {
return 10 return 10
fi fi
fi fi
}
(check_prefix &)
} }
# Succeeds if $IOJS_VERSION represents an io.js version that has a # Succeeds if $IOJS_VERSION represents an io.js version that has a