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

Merge pull request #722 from ajcrites/list-npm-version 

Include npm version when displaying results of switch.
master
Jordan Harband 2015-04-12 10:53:37 -07:00
parent 276d55c912 e4149c380b
commit 6a114eddcc
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nvm.sh
View File

@ -1359,11 +1359,15 @@ nvm() {
fi fi
if [ "_$VERSION" = '_system' ]; then if [ "_$VERSION" = '_system' ]; then
local NPM_VERSION
if nvm_has "npm"; then
NPM_VERSION="(npm v$(npm --version 2>/dev/null))"
fi
if nvm_has_system_node && nvm deactivate >/dev/null 2>&1; then if nvm_has_system_node && nvm deactivate >/dev/null 2>&1; then
echo "Now using system version of node: $(node -v 2>/dev/null)." echo "Now using system version of node: $(node -v 2>/dev/null) $NPM_VERSION"
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
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) $NPM_VERSION"
return return
else else
echo "System version of node not found." >&2 echo "System version of node not found." >&2
@ -1406,10 +1410,14 @@ nvm() {
if [ "$NVM_SYMLINK_CURRENT" = true ]; then if [ "$NVM_SYMLINK_CURRENT" = true ]; then
command rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current" command rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current"
fi fi
local NPM_VERSION
if nvm_has "npm"; then
NPM_VERSION="(npm v$(npm --version 2>/dev/null))"
fi
if nvm_is_iojs_version "$VERSION"; then if nvm_is_iojs_version "$VERSION"; then
echo "Now using io.js $(nvm_strip_iojs_prefix "$VERSION")" echo "Now using io.js $(nvm_strip_iojs_prefix "$VERSION") $NPM_VERSION"
else else
echo "Now using node $VERSION" echo "Now using node $VERSION $NPM_VERSION"
fi fi
;; ;;
"run" ) "run" )

2
test/fast/Running "nvm use system" should work as expected
View File

@ -5,7 +5,7 @@ die () { echo $@ ; exit 1; }
. ../../nvm.sh . ../../nvm.sh
nvm_has_system_node() { return 0; } nvm_has_system_node() { return 0; }
[ "$(nvm use system 2>&1 | tail -n1)" = "Now using system version of node: $(node -v)." ] || die "Could not use system version of node" [ "$(nvm use system 2>&1 | tail -n1)" = "Now using system version of node: $(node -v) (npm v$(npm -v))" ] || die "Could not use system version of node"
nvm_has_system_node() { return 1; } nvm_has_system_node() { return 1; }
[ "$(nvm use system 2>&1 | tail -n1)" = "System version of node not found." ] || die "Did not report error, system node not found" [ "$(nvm use system 2>&1 | tail -n1)" = "System version of node not found." ] || die "Did not report error, system node not found"