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

Merge 4574a25e4f into 3d6b7976e7

This commit is contained in:
Dan Racanelli 2015-02-16 06:46:00 +00:00
parent 3d6b7976e7 4574a25e4f
commit d7ba1b61c3
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nvm.sh
View File

@ -53,6 +53,10 @@ nvm_has_system_iojs() {
[ "$(nvm deactivate >/dev/null 2>&1 && command -v iojs)" != '' ] [ "$(nvm deactivate >/dev/null 2>&1 && command -v iojs)" != '' ]
} }
get_npm_global_prefix() {
echo $(cd $(dirname $(which node))/../ && pwd)
}
# Make zsh glob matching behave same as bash # Make zsh glob matching behave same as bash
# This fixes the "zsh: no matches found" errors # This fixes the "zsh: no matches found" errors
if nvm_has "unsetopt"; then if nvm_has "unsetopt"; then
@ -1271,11 +1275,18 @@ nvm() {
return 127 return 127
fi fi
local NPM_GLOBAL_PREFIX
if [ "_$VERSION" = '_system' ]; then if [ "_$VERSION" = '_system' ]; then
if nvm_has_system_node && nvm deactivate >/dev/null 2>&1; then if nvm_has_system_node && nvm deactivate >/dev/null 2>&1; then
NPM_GLOBAL_PREFIX=$(get_npm_global_prefix)
echo Updating npm global "prefix" to ${NPM_GLOBAL_PREFIX}
npm config set prefix ${NPM_GLOBAL_PREFIX}
echo "Now using system version of node: $(node -v 2>/dev/null)." echo "Now using system version of node: $(node -v 2>/dev/null)."
return return
elif nvm_has_system_iojs && nvm deactivate >/dev/null 2>&1; then elif nvm_has_system_iojs && nvm deactivate >/dev/null 2>&1; then
NPM_GLOBAL_PREFIX=$(get_npm_global_prefix)
echo Updating npm global "prefix" to ${NPM_GLOBAL_PREFIX}
npm config set prefix ${NPM_GLOBAL_PREFIX}
echo "Now using system version of io.js: $(iojs --version 2>/dev/null)." echo "Now using system version of io.js: $(iojs --version 2>/dev/null)."
return return
else else
@ -1319,6 +1330,9 @@ nvm() {
else else
echo "Now using node $VERSION" echo "Now using node $VERSION"
fi fi
NPM_GLOBAL_PREFIX=$(get_npm_global_prefix)
echo Updating npm global "prefix" to ${NPM_GLOBAL_PREFIX}
npm config set prefix ${NPM_GLOBAL_PREFIX}
;; ;;
"run" ) "run" )
local provided_version local provided_version