v0.25.3

Fixes #721

.gitattributes

@@ -0,0 +1 @@
+*.sh eol=lf

.travis.yml

@@ -10,11 +10,7 @@ install:
 script:
   - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL
 env:
-  - SHELL=sh TEST_SUITE=install_script
-  - SHELL=dash TEST_SUITE=install_script
   - SHELL=bash TEST_SUITE=install_script
-  - SHELL=zsh TEST_SUITE=install_script
-#  - SHELL=ksh TEST_SUITE=install_script
   - SHELL=sh TEST_SUITE=fast
   - SHELL=dash TEST_SUITE=fast
   - SHELL=bash TEST_SUITE=fast

README.markdown

@@ -16,11 +16,11 @@ Note: `nvm` does not support [Fish] either (see [#303](https://github.com/creati
 
 To install you could use the [install script][2] using cURL:
 
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.24.1/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.3/install.sh | bash
 
 or Wget:
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.24.1/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.25.3/install.sh | bash
 
 <sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc` or `~/.profile`).</sub>
 
@@ -39,7 +39,7 @@ Or if you have `git` installed, then just clone it, and check out the latest ver
 
 To activate nvm, you need to source it from your shell:
 
-    source ~/.nvm/nvm.sh
+    . ~/.nvm/nvm.sh
 
 I always add this line to my `~/.bashrc`, `~/.profile`, or `~/.zshrc` file to have it automatically sourced upon login.
 Often I also put in a line to use a specific version of node.
@@ -187,6 +187,20 @@ nvm uninstall
 	$ nvm uninstall [tab][tab]
 	my_alias        default        v0.6.21        v0.8.26       v0.10.28
 
+## Compatibility Issues
+`nvm` will encounter some issues if you have some non-default settings set. (see [#606](/../../issues/606))
+The following are known to cause issues:
+
+Inside `~/.npmrc`
+```
+prefix='some/path'
+```
+Environment Variables:
+```
+$NPM_CONFIG_PREFIX
+$PREFIX
+```
+
 ## Problems
 
 If you try to install a node version and the installation fails, be sure to delete the node downloads from src (~/.nvm/src/) or you might get an error when trying to reinstall them again or you might get an error like the following:
@@ -206,7 +220,7 @@ After the v0.8.6 release of node, nvm tries to install from binary packages. But
     nvm install -s 0.8.6
 
 [1]: https://github.com/creationix/nvm.git
-[2]: https://github.com/creationix/nvm/blob/v0.24.1/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.25.3/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
 [Fish]: http://fishshell.com

install.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+{ # this ensures the entire script is downloaded #
+
 nvm_has() {
   type "$1" > /dev/null 2>&1
 }
@@ -11,7 +13,7 @@ if [ -z "$NVM_DIR" ]; then
 fi
 
 nvm_latest_version() {
-  echo "v0.24.1"
+  echo "v0.25.3"
 }
 
 #
@@ -42,7 +44,7 @@ nvm_source() {
 
 nvm_download() {
   if nvm_has "curl"; then
-    curl $*
+    curl -q $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -71,7 +73,12 @@ install_nvm_from_git() {
   fi
   cd "$NVM_DIR" && command git checkout --quiet $(nvm_latest_version)
   if [ ! -z "$(cd "$NVM_DIR" && git show-ref refs/heads/master)" ]; then
+    if git branch --quiet 2>/dev/null; then
       cd "$NVM_DIR" && command git branch --quiet -D master >/dev/null 2>&1
+    else
+      echo >&2 "Your version of git is out of date. Please update it!"
+      cd "$NVM_DIR" && command git branch -D master >/dev/null 2>&1
+    fi
   fi
   return
 }
@@ -236,3 +243,5 @@ nvm_reset() {
 }
 
 [ "_$NVM_ENV" = "_testing" ] || nvm_do_install
+
+} # this ensures the entire script is downloaded #

nvm-exec

@@ -11,4 +11,3 @@ else
 fi
 
 exec $@
-

nvm.sh

@@ -6,6 +6,8 @@
 # Implemented by Tim Caswell <tim@creationix.com>
 # with much bash help from Matthew Ranney
 
+{ # this ensures the entire script is downloaded #
+
 NVM_SCRIPT_SOURCE="$_"
 
 nvm_has() {
@@ -20,7 +22,7 @@ nvm_is_alias() {
 nvm_get_latest() {
   local NVM_LATEST_URL
   if nvm_has "curl"; then
-    NVM_LATEST_URL="$(curl -w "%{url_effective}\n" -L -s -S http://latest.nvm.sh -o /dev/null)"
+    NVM_LATEST_URL="$(curl -q -w "%{url_effective}\n" -L -s -S http://latest.nvm.sh -o /dev/null)"
   elif nvm_has "wget"; then
     NVM_LATEST_URL="$(wget http://latest.nvm.sh --server-response -O /dev/null 2>&1 | awk '/^  Location: /{DEST=$2} END{ print DEST }')"
   else
@@ -37,7 +39,7 @@ nvm_get_latest() {
 
 nvm_download() {
   if nvm_has "curl"; then
-    curl $*
+    curl -q $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -58,6 +60,12 @@ nvm_has_system_iojs() {
   [ "$(nvm deactivate >/dev/null 2>&1 && command -v iojs)" != '' ]
 }
 
+nvm_print_npm_version() {
+  if nvm_has "npm"; then
+    npm --version 2>/dev/null | command xargs printf " (npm v%s)"
+  fi
+}
+
 # Make zsh glob matching behave same as bash
 # This fixes the "zsh: no matches found" errors
 if nvm_has "unsetopt"; then
@@ -307,7 +315,7 @@ nvm_is_valid_version() {
 }
 
 nvm_normalize_version() {
-  echo "${1#v*}" | command awk -F. '{ printf("%d%06d%06d\n", $1,$2,$3); }'
+  echo "${1#v}" | command awk -F. '{ printf("%d%06d%06d\n", $1,$2,$3); }'
 }
 
 nvm_ensure_version_prefix() {
@@ -324,7 +332,7 @@ nvm_format_version() {
   local VERSION
   VERSION="$(nvm_ensure_version_prefix "$1")"
   if [ "_$(nvm_num_version_groups "$VERSION")" != "_3" ]; then
-    nvm_format_version "${VERSION%*\.}.0"
+    nvm_format_version "${VERSION%.}.0"
   else
     echo "$VERSION"
   fi
@@ -333,12 +341,12 @@ nvm_format_version() {
 nvm_num_version_groups() {
   local VERSION
   VERSION="$1"
+  VERSION="${VERSION#v}"
+  VERSION="${VERSION%.}"
   if [ -z "$VERSION" ]; then
     echo "0"
     return
   fi
-  VERSION="${VERSION#v*}"
-  VERSION="${VERSION%\.}"
   local NVM_NUM_DOTS
   NVM_NUM_DOTS=$(echo "$VERSION" | command sed -e 's/[^\.]//g')
   local NVM_NUM_GROUPS
@@ -510,7 +518,7 @@ nvm_strip_iojs_prefix() {
   if [ "_$1" = "_$NVM_IOJS_PREFIX" ]; then
     echo
   else
-    echo "${1#"$NVM_IOJS_PREFIX"-*}"
+    echo "${1#"$NVM_IOJS_PREFIX"-}"
   fi
 }
 
@@ -565,7 +573,7 @@ nvm_ls() {
         local NUM_VERSION_GROUPS
         NUM_VERSION_GROUPS="$(nvm_num_version_groups "$PATTERN")"
         if [ "_$NUM_VERSION_GROUPS" = "_2" ] || [ "_$NUM_VERSION_GROUPS" = "_1" ]; then
-          PATTERN="${PATTERN%*\.}."
+          PATTERN="${PATTERN%.}."
         fi
       ;;
     esac
@@ -681,9 +689,10 @@ nvm_ls_remote_iojs() {
     PATTERN=".*"
   fi
   VERSIONS="$(nvm_download -L -s $NVM_IOJS_ORG_VERSION_LISTING -o - \
-    | command sed 1d \
-    | command sed "s/^/$(nvm_iojs_prefix)-/" \
-    | command cut -f1 \
+    | command sed "
+        1d;
+        s/^/$(nvm_iojs_prefix)-/;
+        s/[[:blank:]].*//" \
     | command grep -w "$PATTERN" \
     | command sort)"
   if [ -z "$VERSIONS" ]; then
@@ -863,16 +872,35 @@ nvm_get_os() {
 
 nvm_get_arch() {
   local NVM_UNAME
-  NVM_UNAME="$(uname -a)"
+  NVM_UNAME="$(uname -m)"
   local NVM_ARCH
   case "$NVM_UNAME" in
-    *x86_64*) NVM_ARCH=x64 ;;
-    *i*86*) NVM_ARCH=x86 ;;
-    *) NVM_ARCH="$(uname -m)" ;;
+    x86_64) NVM_ARCH="x64" ;;
+    i*86) NVM_ARCH="x86" ;;
+    *) NVM_ARCH="$NVM_UNAME" ;;
   esac
   echo "$NVM_ARCH"
 }
 
+nvm_ensure_default_set() {
+  local VERSION
+  VERSION="$1"
+  if [ -z "$VERSION" ]; then
+    echo 'nvm_ensure_default_set: a version is required' >&2
+    return 1
+  fi
+  if nvm_alias default >/dev/null 2>&1; then
+    # default already set
+    return 0
+  fi
+  local OUTPUT
+  OUTPUT="$(nvm alias default "$VERSION")"
+  local EXIT_CODE
+  EXIT_CODE="$?"
+  echo "Creating default alias: $OUTPUT"
+  return $EXIT_CODE
+}
+
 nvm_install_iojs_binary() {
   local PREFIXED_VERSION
   PREFIXED_VERSION="$1"
@@ -903,9 +931,16 @@ nvm_install_iojs_binary() {
       tmpdir="$NVM_DIR/bin/iojs-${t}"
       local tmptarball
       tmptarball="$tmpdir/iojs-${t}.tar.gz"
-      if (
+      local NVM_INSTALL_ERRORED
       command mkdir -p "$tmpdir" && \
-        nvm_download -L -C - --progress-bar $url -o "$tmptarball" && \
+        nvm_download -L -C - --progress-bar $url -o "$tmptarball" || \
+        NVM_INSTALL_ERRORED=true
+      if grep '404 Not Found' "$tmptarball" >/dev/null; then
+        NVM_INSTALL_ERRORED=true
+        echo >&2 "HTTP 404 at URL $url";
+      fi
+      if (
+        [ "$NVM_INSTALL_ERRORED" != true ] && \
         echo "WARNING: checksums are currently disabled for io.js" >&2 && \
         # nvm_checksum "$tmptarball" $sum && \
         command tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
@@ -915,7 +950,7 @@ nvm_install_iojs_binary() {
       ); then
         return 0
       else
-        echo "Binary download failed, trying source." >&2
+        echo >&2 "Binary download failed, trying source." >&2
         command rm -rf "$tmptarball" "$tmpdir"
         return 1
       fi
@@ -947,7 +982,7 @@ nvm_install_node_binary() {
     if nvm_binary_available "$VERSION"; then
       local NVM_ARCH
       NVM_ARCH="$(nvm_get_arch)"
-      if [ $NVM_ARCH = "armv6l" ]; then
+      if [ $NVM_ARCH = "armv6l" ] || [ $NVM_ARCH = "armv7l" ]; then
          NVM_ARCH="arm-pi"
       fi
       t="$VERSION-$NVM_OS-$NVM_ARCH"
@@ -957,9 +992,16 @@ nvm_install_node_binary() {
       tmpdir="$NVM_DIR/bin/node-${t}"
       local tmptarball
       tmptarball="$tmpdir/node-${t}.tar.gz"
-      if (
+      local NVM_INSTALL_ERRORED
       command mkdir -p "$tmpdir" && \
-        nvm_download -L -C - --progress-bar $url -o "$tmptarball" && \
+        nvm_download -L -C - --progress-bar $url -o "$tmptarball" || \
+        NVM_INSTALL_ERRORED=true
+      if grep '404 Not Found' "$tmptarball" >/dev/null; then
+        NVM_INSTALL_ERRORED=true
+        echo >&2 "HTTP 404 at URL $url";
+      fi
+      if (
+        [ "$NVM_INSTALL_ERRORED" != true ] && \
         nvm_checksum "$tmptarball" $sum && \
         command tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
         command rm -f "$tmptarball" && \
@@ -968,7 +1010,7 @@ nvm_install_node_binary() {
       ); then
         return 0
       else
-        echo "Binary download failed, trying source." >&2
+        echo >&2 "Binary download failed, trying source."
         command rm -rf "$tmptarball" "$tmpdir"
         return 1
       fi
@@ -980,10 +1022,8 @@ nvm_install_node_binary() {
 nvm_install_node_source() {
   local VERSION
   VERSION="$1"
-  local REINSTALL_PACKAGES_FROM
-  REINSTALL_PACKAGES_FROM="$2"
   local ADDITIONAL_PARAMETERS
-  ADDITIONAL_PARAMETERS="$3"
+  ADDITIONAL_PARAMETERS="$2"
 
   if [ -n "$ADDITIONAL_PARAMETERS" ]; then
     echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"
@@ -1029,9 +1069,6 @@ nvm_install_node_source() {
     $make $MAKE_CXX install
     )
   then
-    if nvm use "$VERSION" && [ ! -z "$REINSTALL_PACKAGES_FROM" ] && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
-      nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
-    fi
     if ! nvm_has "npm" ; then
       echo "Installing npm..."
       if nvm_version_greater 0.2.0 "$VERSION"; then
@@ -1104,6 +1141,17 @@ nvm() {
       echo
     ;;
 
+    "debug" )
+      echo >&2 "\$SHELL: $SHELL"
+      echo >&2 "\$NVM_DIR: $(echo $NVM_DIR | sed "s#$HOME#\$HOME#g")"
+      for NVM_DEBUG_COMMAND in 'nvm current' 'which node' 'which iojs' 'which npm' 'npm config get prefix' 'npm root -g'
+      do
+        local NVM_DEBUG_OUTPUT="$($NVM_DEBUG_COMMAND | sed "s#$NVM_DIR#\$NVM_DIR#g")"
+        echo >&2 "$NVM_DEBUG_COMMAND: ${NVM_DEBUG_OUTPUT}"
+      done
+      return 42
+    ;;
+
     "install" | "i" )
       local nobinary
       local version_not_provided
@@ -1204,31 +1252,32 @@ nvm() {
         # io.js does not have a SunOS binary
         nobinary=1
       fi
+      local NVM_INSTALL_SUCCESS
       # skip binary install if "nobinary" option specified.
       if [ $nobinary -ne 1 ] && nvm_binary_available "$VERSION"; then
-        local NVM_INSTALL_SUCCESS
         if [ "$NVM_IOJS" = true ] && nvm_install_iojs_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
           NVM_INSTALL_SUCCESS=true
         elif [ "$NVM_IOJS" != true ] && nvm_install_node_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
           NVM_INSTALL_SUCCESS=true
         fi
+      fi
+      if [ "$NVM_INSTALL_SUCCESS" != true ]; then
+        if [ "$NVM_IOJS" = true ]; then
+          # nvm_install_iojs_source "$VERSION" "$ADDITIONAL_PARAMETERS"
+          echo "Installing iojs from source is not currently supported" >&2
+          return 105
+        elif nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then
+          NVM_INSTALL_SUCCESS=true
+        fi
+      fi
 
-        if [ "$NVM_INSTALL_SUCCESS" = true ] \
-          && nvm use "$VERSION" \
-          && [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
+      if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then
+        if [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
           && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
           nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
         fi
+      fi
       return $?
-      fi
-
-      if [ "$NVM_IOJS" = true ]; then
-        # nvm_install_iojs_source "$VERSION" "$REINSTALL_PACKAGES_FROM" "$ADDITIONAL_PARAMETERS"
-        echo "Installing iojs from source is not currently supported" >&2
-        return 105
-      else
-        nvm_install_node_source "$VERSION" "$REINSTALL_PACKAGES_FROM" "$ADDITIONAL_PARAMETERS"
-      fi
     ;;
     "uninstall" )
       if [ $# -ne 2 ]; then
@@ -1347,10 +1396,10 @@ nvm() {
 
       if [ "_$VERSION" = '_system' ]; 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)$(nvm_print_npm_version)"
           return
         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)$(nvm_print_npm_version)"
           return
         else
           echo "System version of node not found." >&2
@@ -1394,9 +1443,9 @@ nvm() {
         command rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current"
       fi
       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")$(nvm_print_npm_version)"
       else
-        echo "Now using node $VERSION"
+        echo "Now using node $VERSION$(nvm_print_npm_version)"
       fi
     ;;
     "run" )
@@ -1451,6 +1500,13 @@ nvm() {
       if [ "_$VERSION" = "_N/A" ]; then
         echo "$(nvm_ensure_version_prefix "$provided_version") is not installed yet" >&2
         EXIT_CODE=1
+      elif [ -z "$ARGS" ]; then
+        if [ "$NVM_IOJS" = true ]; then
+          nvm exec "$VERSION" iojs
+        else
+          nvm exec "$VERSION" node
+        fi
+        EXIT_CODE="$?"
       elif [ "$NVM_IOJS" = true ]; then
         echo "Running io.js $(nvm_strip_iojs_prefix "$VERSION")"
         OUTPUT="$(nvm use "$VERSION" >/dev/null && iojs $ARGS)"
@@ -1669,20 +1725,21 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       fi
 
       local NPMLIST
+      local VERSION
       if [ "_$PROVIDED_VERSION" = "_system" ]; then
         if ! nvm_has_system_node && ! nvm_has_system_iojs; then
           echo 'No system version of node or io.js detected.' >&2
           return 3
         fi
+        VERSION="system"
         NPMLIST=$(nvm deactivate > /dev/null && npm list -g --depth=0 | command tail -n +2)
       else
-        local VERSION
         VERSION="$(nvm_version "$PROVIDED_VERSION")"
         NPMLIST=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 | command tail -n +2)
       fi
 
       local INSTALLS
-      INSTALLS=$(echo "$NPMLIST" | command sed -e '/ -> / d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | command xargs)
+      INSTALLS=$(echo "$NPMLIST" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | command xargs)
 
       echo "Copying global packages from $VERSION..."
       echo "$INSTALLS" | command xargs npm install -g --quiet
@@ -1703,7 +1760,7 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       nvm_version $2
     ;;
     "--version" )
-      echo "0.24.1"
+      echo "0.25.3"
     ;;
     "unload" )
       unset -f nvm nvm_print_versions nvm_checksum \
@@ -1727,7 +1784,7 @@ nvm_supports_source_options() {
   [ "_$(echo 'echo $1' | . /dev/stdin yes 2> /dev/null)" = "_yes" ]
 }
 
-VERSION="$(nvm_alias default 2>/dev/null)"
+VERSION="$(nvm_alias default 2>/dev/null || echo)"
 if nvm_supports_source_options && [ "_$1" = "_--install" ]; then
   if [ -n "$VERSION" ]; then
     nvm install "$VERSION" >/dev/null
@@ -1739,3 +1796,5 @@ elif [ -n "$VERSION" ]; then
 elif nvm_rc_version >/dev/null 2>&1; then
   nvm use >/dev/null
 fi
+
+} # this ensures the entire script is downloaded #

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.24.1",
+  "version": "0.25.3",
   "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
   "directories": {
     "test": "test"
@@ -30,8 +30,8 @@
   },
   "homepage": "https://github.com/creationix/nvm",
   "devDependencies": {
-    "replace": "~0.3.0",
-    "semver": "~4.2.0",
-    "urchin": "~0.0.5"
+    "replace": "^0.3.0",
+    "semver": "^4.3.4",
+    "urchin": "^0.0.5"
   }
 }

test/fast/Aliases/nvm_ensure_default_set

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm alias default 0.1 >/dev/null || die "'nvm alias default 0.1' failed"
+
+nvm_ensure_default_set 0.3 || die "'nvm_ensure_default_set' with an existing default alias exits 0"
+
+nvm unalias default || die "'nvm unalias default' failed"
+
+OUTPUT="$(nvm_ensure_default_set 0.2)"
+EXPECTED_OUTPUT="Creating default alias: default -> 0.2 (-> iojs-v0.2.10)"
+EXIT_CODE="$?"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set 0.2' did not output '$EXPECTED_OUTPUT', got '$OUTPUT'"
+[ "_$EXIT_CODE" = "_0" ] || die "'nvm_ensure_default_set 0.2' did not exit with 0, got $EXIT_CODE"

test/fast/Aliases/teardown

@@ -14,3 +14,4 @@ rm -f "../../../alias/stable"
 rm -f "../../../alias/unstable"
 rm -f "../../../alias/node"
 rm -f "../../../alias/iojs"
+rm -f "../../../alias/default"

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

@@ -5,9 +5,13 @@ die () { echo $@ ; exit 1; }
 . ../../nvm.sh
 
 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_print_npm_version() { return ' (npm v1.2.3)'; }
+EXPECTED_OUTPUT="Now using system version of node: $(node -v)$(nvm_print_npm_version)"
+[ "$(nvm use system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Could not use system version of node"
 
 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_print_npm_version() { return ''; }
+EXPECTED_OUTPUT="System version of node not found."
+[ "$(nvm use system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Did not report error, system node not found"
 nvm use system 2>&1 > /dev/null || [ $? -eq 127 ] || die "Did not return error code, system node not found"
 

test/fast/Unit tests/nvm_ensure_default_set

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXPECTED_OUTPUT="nvm_ensure_default_set: a version is required"
+OUTPUT="$(nvm_ensure_default_set 2>&1 >/dev/null)"
+EXIT_CODE="$?"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set' did not output "$EXPECTED_OUTPUT", got "$OUTPUT""
+[ "_$EXIT_CODE" = "_1" ] || die "'nvm_ensure_default_set' did not exit with 1, got "$EXIT_CODE""
+
+# see test/fast/Aliases for remaining nvm_ensure_default_set tests

test/fast/Unit tests/nvm_num_version_groups

@@ -5,13 +5,17 @@ die () { echo $@ ; exit 1; }
 . ../../../nvm.sh
 
 [ "~$(nvm_num_version_groups)" = "~0" ] || die "no args should give 0"
+[ "~$(nvm_num_version_groups v)" = "~0" ] || die "just "v" should give 0"
+[ "~$(nvm_num_version_groups .)" = "~0" ] || die "just "." should give 0"
 [ "~$(nvm_num_version_groups a)" = "~1" ] || die "one letter should give 1"
 
 [ "~$(nvm_num_version_groups 1)" = "~1" ] || die "1 should give 1"
+[ "~$(nvm_num_version_groups 1.)" = "~1" ] || die "1. should give 1"
 [ "~$(nvm_num_version_groups v1)" = "~1" ] || die "v1 should give 1"
 [ "~$(nvm_num_version_groups v1.)" = "~1" ] || die "v1. should give 1"
 
 [ "~$(nvm_num_version_groups 1.2)" = "~2" ] || die "1.2 should give 2"
+[ "~$(nvm_num_version_groups 1.2.)" = "~2" ] || die "1.2. should give 2"
 [ "~$(nvm_num_version_groups v1.2)" = "~2" ] || die "v1.2 should give 2"
 [ "~$(nvm_num_version_groups v1.2.)" = "~2" ] || die "v1.2. should give 2"
 

test/fast/Unit tests/nvm_print_npm_version

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+cleanup () {
+  alias nvm_has='\nvm_has'
+  alias npm='\npm'
+  unset -f nvm_has npm
+}
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm_has() { return 1; }
+OUTPUT="$(nvm_print_npm_version)"
+[ -z "$OUTPUT" ] || die "nvm_print_npm_version did not return empty when nvm_has returns 1, got '$OUTPUT'"
+
+nvm_has() { return 0; }
+npm() {
+  if [ "_$@" = "_--version" ]; then
+    echo "1.2.3"
+  else
+    echo "error"
+  fi
+}
+OUTPUT="$(nvm_print_npm_version)"
+EXPECTED_OUTPUT=" (npm v1.2.3)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_print_npm_version did not provided '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+cleanup

test/install_script/nvm_reset

@@ -15,7 +15,7 @@ safe_type() {
 safe_type nvm_reset || die 'nvm_reset is not available'
 
 # Apply nvm_reset
-nvm_reset
+nvm_reset || die 'nvm_reset failed'
 
 # The names should be unset
 ! safe_type nvm_do_install || die 'nvm_do_install is still available'

test/slow/nvm_get_latest/nvm_get_latest

@@ -10,12 +10,12 @@ cleanup() {
 
 EXPECTED_VERSION="v12.3.456"
 URL="https://github.com/creationix/nvm/releases/tag/$EXPECTED_VERSION"
-EXPECTED_CURL_ARGS="-w %{url_effective}\n -L -s -S http://latest.nvm.sh -o /dev/null"
+EXPECTED_CURL_ARGS="-q -w %{url_effective}\n -L -s -S http://latest.nvm.sh -o /dev/null"
 EXPECTED_WGET_ARGS="http://latest.nvm.sh --server-response -O /dev/null"
 
 curl() {
   if [ "_$*" != "_$EXPECTED_CURL_ARGS" ]; then
-    echo 2>& "expected args ($EXPECTED_CURL_ARGS), got ($*)"
+    echo >&2 "expected args ($EXPECTED_CURL_ARGS), got ($*)"
     return 1
   else
     echo $URL
@@ -23,7 +23,7 @@ curl() {
 }
 wget() {
   if [ "_$*" != "_$EXPECTED_WGET_ARGS" ]; then
-    echo 2>& "expected args ($EXPECTED_WGET_ARGS), got ($*)"
+    echo >&2 "expected args ($EXPECTED_WGET_ARGS), got ($*)"
     return 1
   else
     local WGET_CONTENTS
@@ -100,7 +100,7 @@ Saving to: ‘/dev/null’
 "
     "$WGET_CONTENTS" | while read line
     do
-      2>& echo "$line"
+      >&2 echo "$line"
     done
   fi
 }

test/sourcing/Sourcing nvm.sh with no default should return 0

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+touch ../../alias/default
+rm ../../alias/default || die 'removal of default alias failed'
+nvm_alias default && die '"nvm_alias default" did not fail'
+
+set -e # necessary to fail internally with a nonzero code
+
+. ../../nvm.sh || die 'sourcing returned nonzero exit code'