273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] `zsh`: when `warncreateglobal` is set, this line warns for some reason. Use `env` to suppress it. 

Fixes #1236.
Jordan Harband 2016-09-18 13:39:50 -07:00
parent acbdd9a3fa
commit d12ccb130d
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nvm.sh
View File

@ -1945,10 +1945,10 @@ nvm_die_on_prefix() {
fi fi
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 get prefix)"
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 delete prefix
else else
nvm deactivate >/dev/null 2>&1 nvm deactivate >/dev/null 2>&1
nvm_err "nvm is not compatible with the npm config \"prefix\" option: currently set to \"$NVM_NPM_PREFIX\"" nvm_err "nvm is not compatible with the npm config \"prefix\" option: currently set to \"$NVM_NPM_PREFIX\""

4
test/fast/Unit tests/nvm_die_on_prefix
View File

@ -36,7 +36,7 @@ nvm_has() { return 0; }
npm() { npm() {
local args local args
args="$@" args="$@"
if [ "_$args" = "_config get prefix" ]; then if [ "_$args" = "_config --loglevel=warn get prefix" ]; then
echo "$(nvm_version_dir new)/good prefix" echo "$(nvm_version_dir new)/good prefix"
fi fi
} }
@ -60,7 +60,7 @@ EXIT_CODE="$(NPM_CONFIG_PREFIX=bar nvm_die_on_prefix 0 foo >/dev/null 2>&1; echo
npm() { npm() {
local args local args
args="$@" args="$@"
if [ "_$args" = "_config get prefix" ]; then if [ "_$args" = "_config --loglevel=warn get prefix" ]; then
echo "./bad prefix" echo "./bad prefix"
fi fi
} }