v0.25.0

adding architecture detection for Raspberry Pi 2

.gitattributes

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

.travis.yml

@@ -1,6 +1,9 @@
 language: c # defaults to ruby
+addons:
+  apt_packages:
+  - zsh
+  - ksh
 install:
-  - sudo apt-get install zsh -y # ksh
   - (mkdir /tmp/urchin && cd /tmp/urchin && curl -s "$(curl -s https://registry.npmjs.com/urchin | grep -Eo '"tarball":\s*"[^"]+"' | tail -n 1 | awk -F\" '{ print $4 }')" -O && tar -x -f urchin*)
   - chmod +x /tmp/urchin/package/urchin
   - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'

README.markdown

@@ -8,15 +8,19 @@ Note: `nvm` does not support Windows (see [#284](https://github.com/creationix/n
  - [nvmw](https://github.com/hakobera/nvmw)
  - [nvm-windows](https://github.com/coreybutler/nvm-windows)
 
+Note: `nvm` does not support [Fish] either (see [#303](https://github.com/creationix/nvm/issues/303)). Two alternatives exist, which are not supported nor developed by us:
+ - [nvm-fish-wrapper](https://github.com/passcod/nvm-fish-wrapper)
+ - [nvm-fish](https://github.com/Alex7Kom/nvm-fish) (does not support iojs)
+
 ### Install script
 
 To install you could use the [install script][2] using cURL:
 
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.23.1/install.sh | bash
+    curl https://raw.githubusercontent.com/creationix/nvm/v0.25.0/install.sh | bash
 
 or Wget:
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.23.1/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.25.0/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>
 
@@ -35,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.
@@ -72,7 +76,7 @@ In place of a version pointer like "0.10", you can use the special default alias
     nvm use stable
     nvm run unstable --version
 
-If you want to install `io.js`:
+If you want to install [io.js](https://github.com/iojs/io.js/):
 
     nvm install iojs
 
@@ -183,17 +187,31 @@ 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:
 
     curl: (33) HTTP server doesn't seem to support byte ranges. Cannot resume.
 
-Where's my 'sudo node'? Checkout this link:
+Where's my 'sudo node'? Check out this link:
 
 https://github.com/creationix/nvm/issues/43
 
-on Arch Linux and other systems using python3 by default, before running *install* you need to
+On Arch Linux and other systems using python3 by default, before running *install* you need to
 
       export PYTHON=python2
 
@@ -202,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.23.1/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.25.0/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
-
+[Fish]: http://fishshell.com

bash_completion

@@ -73,7 +73,7 @@ __nvm ()
   previous_word="${COMP_WORDS[COMP_CWORD-1]}"
 
   case "$previous_word" in
-  use|run|ls|list|uninstall) __nvm_installed_nodes ;;
+  use|run|exec|ls|list|uninstall) __nvm_installed_nodes ;;
   alias|unalias)  __nvm_alias ;;
   *)              __nvm_commands ;;
   esac

install.sh

@@ -11,33 +11,33 @@ if [ -z "$NVM_DIR" ]; then
 fi
 
 nvm_latest_version() {
-  echo "v0.23.1"
+  echo "v0.25.0"
 }
 
 #
 # Outputs the location to NVM depending on:
 # * The availability of $NVM_SOURCE
 # * The method used ("script" or "git" in the script, defaults to "git")
-# NVM_SOURCE always takes precedence
+# NVM_SOURCE always takes precedence unless the method is "script-nvm-exec"
 #
 nvm_source() {
   local NVM_METHOD
   NVM_METHOD="$1"
-  if [ -z "$NVM_SOURCE" ]; then
+  local NVM_SOURCE_URL
-    local NVM_SOURCE
+  NVM_SOURCE_URL="$NVM_SOURCE"
+  if [ "_$NVM_METHOD" = "_script-nvm-exec" ]; then
+    NVM_SOURCE_URL="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm-exec"
+  elif [ -z "$NVM_SOURCE_URL" ]; then
     if [ "_$NVM_METHOD" = "_script" ]; then
-      NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm.sh"
+      NVM_SOURCE_URL="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm.sh"
-    elif [ "_$NVM_METHOD" = "_script-nvm-exec" ]; then
-      NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm-exec"
     elif [ "_$NVM_METHOD" = "_git" ] || [ -z "$NVM_METHOD" ]; then
-      NVM_SOURCE="https://github.com/creationix/nvm.git"
+      NVM_SOURCE_URL="https://github.com/creationix/nvm.git"
     else
       echo >&2 "Unexpected value \"$NVM_METHOD\" for \$NVM_METHOD"
       return 1
     fi
   fi
-  echo "$NVM_SOURCE"
+  echo "$NVM_SOURCE_URL"
-  return 0
 }
 
 nvm_download() {
@@ -69,13 +69,21 @@ install_nvm_from_git() {
     mkdir -p "$NVM_DIR"
     command git clone "$(nvm_source git)" "$NVM_DIR"
   fi
-  cd "$NVM_DIR" && command git checkout --quiet $(nvm_latest_version) && command git branch --quiet -D master >/dev/null 2>&1
+  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
 }
 
 install_nvm_as_script() {
-  local NVM_SOURCE
+  local NVM_SOURCE_LOCAL
-  NVM_SOURCE=$(nvm_source script)
+  NVM_SOURCE_LOCAL=$(nvm_source script)
   local NVM_EXEC_SOURCE
   NVM_EXEC_SOURCE=$(nvm_source script-nvm-exec)
 
@@ -86,8 +94,8 @@ install_nvm_as_script() {
   else
     echo "=> Downloading nvm as script to '$NVM_DIR'"
   fi
-  nvm_download -s "$NVM_SOURCE" -o "$NVM_DIR/nvm.sh" || {
+  nvm_download -s "$NVM_SOURCE_LOCAL" -o "$NVM_DIR/nvm.sh" || {
-    echo >&2 "Failed to download '$NVM_SOURCE'"
+    echo >&2 "Failed to download '$NVM_SOURCE_LOCAL'"
     return 1
   }
   nvm_download -s "$NVM_EXEC_SOURCE" -o "$NVM_DIR/nvm-exec" || {
@@ -120,6 +128,53 @@ nvm_detect_profile() {
   fi
 }
 
+#
+# Check whether the user has any globally-installed npm modules in their system
+# Node, and warn them if so.
+#
+nvm_check_global_modules() {
+  command -v npm >/dev/null 2>&1 || return 0
+
+  local NPM_VERSION
+  NPM_VERSION="$(npm --version)"
+  NPM_VERSION="${NPM_VERSION:--1}"
+  [ "${NPM_VERSION%%[!-0-9]*}" -gt 0 ] || return 0
+
+  local NPM_GLOBAL_MODULES
+  NPM_GLOBAL_MODULES="$(
+    npm list -g --depth=0 |
+    sed '/ npm@/d' |
+    sed '/ (empty)$/d'
+  )"
+
+  local MODULE_COUNT
+  MODULE_COUNT="$(
+    printf %s\\n "$NPM_GLOBAL_MODULES" |
+    sed -ne '1!p' |                             # Remove the first line
+    wc -l | tr -d ' '                           # Count entries
+  )"
+
+  if [ $MODULE_COUNT -ne 0 ]; then
+    cat <<-'END_MESSAGE'
+	=> You currently have modules installed globally with `npm`. These will no
+	=> longer be linked to the active version of Node when you install a new node
+	=> with `nvm`; and they may (depending on how you construct your `$PATH`)
+	=> override the binaries of modules installed with `nvm`:
+
+	END_MESSAGE
+    printf %s\\n "$NPM_GLOBAL_MODULES"
+    cat <<-'END_MESSAGE'
+
+	=> If you wish to uninstall them at a later point (or re-install them under your
+	=> `nvm` Nodes), you can remove them from the system Node as follows:
+
+	     $ nvm use system
+	     $ npm uninstall -g a_module
+
+	END_MESSAGE
+  fi
+}
+
 nvm_do_install() {
   if [ -z "$METHOD" ]; then
     # Autodetect install method
@@ -169,6 +224,8 @@ nvm_do_install() {
     fi
   fi
 
+  nvm_check_global_modules
+
   echo "=> Close and reopen your terminal to start using nvm"
   nvm_reset
 }
@@ -178,7 +235,9 @@ nvm_do_install() {
 # during the execution of the install script
 #
 nvm_reset() {
-  unset -f nvm_do_install nvm_has nvm_download install_nvm_as_script install_nvm_from_git nvm_reset nvm_detect_profile nvm_latest_version
+  unset -f nvm_reset nvm_has nvm_latest_version \
+    nvm_source nvm_download install_nvm_as_script install_nvm_from_git \
+    nvm_detect_profile nvm_check_global_modules nvm_do_install
 }
 
 [ "_$NVM_ENV" = "_testing" ] || nvm_do_install

nvm-exec

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

nvm.sh

@@ -12,6 +12,11 @@ nvm_has() {
   type "$1" > /dev/null 2>&1
 }
 
+nvm_is_alias() {
+  # this is intentionally not "command alias" so it works in zsh.
+  \alias "$1" > /dev/null 2>&1
+}
+
 nvm_get_latest() {
   local NVM_LATEST_URL
   if nvm_has "curl"; then
@@ -53,6 +58,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
@@ -184,6 +195,24 @@ nvm_version_path() {
   fi
 }
 
+nvm_ensure_version_installed() {
+  local PROVIDED_VERSION
+  PROVIDED_VERSION="$1"
+  local LOCAL_VERSION
+  LOCAL_VERSION="$(nvm_version "$PROVIDED_VERSION")"
+  local NVM_VERSION_DIR
+  NVM_VERSION_DIR="$(nvm_version_path "$LOCAL_VERSION")"
+  if [ ! -d "$NVM_VERSION_DIR" ]; then
+    VERSION="$(nvm_resolve_alias "$PROVIDED_VERSION")"
+    if [ $? -eq 0 ]; then
+      echo "N/A: version \"$PROVIDED_VERSION -> $VERSION\" is not yet installed" >&2
+    else
+      echo "N/A: version \"$(nvm_ensure_version_prefix "$PROVIDED_VERSION")\" is not yet installed" >&2
+    fi
+    return 1
+  fi
+}
+
 # Expand a version using the version cache
 nvm_version() {
   local PATTERN
@@ -199,8 +228,10 @@ nvm_version() {
     return $?
   fi
 
+  local NVM_NODE_PREFIX
+  NVM_NODE_PREFIX="$(nvm_node_prefix)"
   case "_$PATTERN" in
-    "_$(nvm_node_prefix)" | "_$(nvm_node_prefix)-")
+    "_$NVM_NODE_PREFIX" | "_$NVM_NODE_PREFIX-")
       PATTERN="stable"
     ;;
   esac
@@ -218,16 +249,16 @@ nvm_remote_version() {
   PATTERN="$1"
   local VERSION
   if nvm_validate_implicit_alias "$PATTERN" 2> /dev/null ; then
-    VERSIONS="$(nvm_ls_remote "$PATTERN")"
-  else
     case "_$PATTERN" in
-      "_$(nvm_node_prefix)")
+      "_$(nvm_iojs_prefix)")
-        VERSION="$(nvm_ls_remote stable)"
+        VERSION="$(nvm_ls_remote_iojs | tail -n1)"
       ;;
       *)
-        VERSION="$(nvm_remote_versions "$PATTERN" | tail -n1)"
+        VERSION="$(nvm_ls_remote "$PATTERN")"
       ;;
     esac
+  else
+    VERSION="$(nvm_remote_versions "$PATTERN" | tail -n1)"
   fi
   echo "$VERSION"
   if [ "_$VERSION" = '_N/A' ]; then
@@ -236,20 +267,22 @@ nvm_remote_version() {
 }
 
 nvm_remote_versions() {
+  local NVM_IOJS_PREFIX
+  NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
   local PATTERN
   PATTERN="$1"
-  if nvm_validate_implicit_alias "$PATTERN" 2> /dev/null ; then
-    echo >&2 "Implicit aliases are not supported in nvm_remote_versions."
-    return 1
-  fi
   case "_$PATTERN" in
-    "_$(nvm_iojs_prefix)" | "_io.js")
+    "_$NVM_IOJS_PREFIX" | "_io.js")
       VERSIONS="$(nvm_ls_remote_iojs)"
     ;;
     "_$(nvm_node_prefix)")
       VERSIONS="$(nvm_ls_remote)"
     ;;
     *)
+      if nvm_validate_implicit_alias "$PATTERN" 2> /dev/null ; then
+        echo >&2 "Implicit aliases are not supported in nvm_remote_versions."
+        return 1
+      fi
       VERSIONS="$(echo "$(nvm_ls_remote "$PATTERN")
 $(nvm_ls_remote_iojs "$PATTERN")" | command grep -v "N/A" | command sed '/^$/d')"
     ;;
@@ -263,8 +296,24 @@ $(nvm_ls_remote_iojs "$PATTERN")" | command grep -v "N/A" | command sed '/^$/d')
   fi
 }
 
+nvm_is_valid_version() {
+  if nvm_validate_implicit_alias "$1" 2> /dev/null; then
+    return 0
+  fi
+  case "$1" in
+    "$(nvm_iojs_prefix)" | "$(nvm_node_prefix)")
+      return 0
+    ;;
+    *)
+      local VERSION
+      VERSION="$(nvm_strip_iojs_prefix "$1")"
+      nvm_version_greater "$VERSION"
+    ;;
+  esac
+}
+
 nvm_normalize_version() {
-  echo "$1" | command sed -e 's/^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() {
@@ -281,8 +330,7 @@ nvm_format_version() {
   local VERSION
   VERSION="$(nvm_ensure_version_prefix "$1")"
   if [ "_$(nvm_num_version_groups "$VERSION")" != "_3" ]; then
-    VERSION="$(echo "$VERSION" | command sed -e 's/\.*$/.0/')"
+    nvm_format_version "${VERSION%.}.0"
-    nvm_format_version "$VERSION"
   else
     echo "$VERSION"
   fi
@@ -291,14 +339,16 @@ nvm_format_version() {
 nvm_num_version_groups() {
   local VERSION
   VERSION="$1"
+  VERSION="${VERSION#v}"
+  VERSION="${VERSION%.}"
   if [ -z "$VERSION" ]; then
     echo "0"
     return
   fi
   local NVM_NUM_DOTS
-  NVM_NUM_DOTS=$(echo "$VERSION" | command sed -e 's/^v//' | command sed -e 's/\.$//' | command sed -e 's/[^\.]//g')
+  NVM_NUM_DOTS=$(echo "$VERSION" | command sed -e 's/[^\.]//g')
   local NVM_NUM_GROUPS
-  NVM_NUM_GROUPS=".$NVM_NUM_DOTS"
+  NVM_NUM_GROUPS=".$NVM_NUM_DOTS" # add extra dot, since it's (n - 1) dots at this point
   echo "${#NVM_NUM_GROUPS}"
 }
 
@@ -397,11 +447,20 @@ nvm_resolve_alias() {
   done
 
   if [ -n "$ALIAS" ] && [ "_$ALIAS" != "_$PATTERN" ]; then
-    if [ "_$ALIAS" = "_∞" ]; then
+    local NVM_IOJS_PREFIX
-      echo "$ALIAS"
+    NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-    else
+    local NVM_NODE_PREFIX
-      nvm_version "$ALIAS"
+    NVM_NODE_PREFIX="$(nvm_node_prefix)"
-    fi
+    case "_$ALIAS" in
+      "_∞" | \
+      "_$NVM_IOJS_PREFIX" | "_$NVM_IOJS_PREFIX-" | \
+      "_$NVM_NODE_PREFIX" )
+        echo "$ALIAS"
+      ;;
+      *)
+        nvm_ensure_version_prefix "$ALIAS"
+      ;;
+    esac
     return 0
   fi
 
@@ -409,15 +468,32 @@ nvm_resolve_alias() {
     local IMPLICIT
     IMPLICIT="$(nvm_print_implicit_alias local "$PATTERN" 2> /dev/null)"
     if [ -n "$IMPLICIT" ]; then
-      nvm_version "$IMPLICIT"
+      nvm_ensure_version_prefix "$IMPLICIT"
-      return $?
     fi
-    return 3
   fi
 
   return 2
 }
 
+nvm_resolve_local_alias() {
+  if [ -z "$1" ]; then
+    return 1
+  fi
+
+  local VERSION
+  local EXIT_CODE
+  VERSION="$(nvm_resolve_alias "$1")"
+  EXIT_CODE=$?
+  if [ -z "$VERSION" ]; then
+    return $EXIT_CODE
+  fi
+  if [ "_$VERSION" != "_∞" ]; then
+    nvm_version "$VERSION"
+  else
+    echo "$VERSION"
+  fi
+}
+
 nvm_iojs_prefix() {
   echo "iojs"
 }
@@ -426,7 +502,8 @@ nvm_node_prefix() {
 }
 
 nvm_is_iojs_version() {
-  [ "_$(echo "$1" | cut -c1-5)" = "_iojs-" ]
+  case "$1" in iojs-*) return 0 ;; esac
+  return 1
 }
 
 nvm_add_iojs_prefix() {
@@ -439,7 +516,7 @@ nvm_strip_iojs_prefix() {
   if [ "_$1" = "_$NVM_IOJS_PREFIX" ]; then
     echo
   else
-    echo "$1" | command sed "s/^$NVM_IOJS_PREFIX-//"
+    echo "${1#"$NVM_IOJS_PREFIX"-}"
   fi
 }
 
@@ -453,32 +530,48 @@ nvm_ls() {
     return
   fi
 
-  if nvm_resolve_alias "$PATTERN"; then
+  local NVM_IOJS_PREFIX
-    return
+  NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-  fi
+  local NVM_NODE_PREFIX
+  NVM_NODE_PREFIX="$(nvm_node_prefix)"
+  local NVM_VERSION_DIR_IOJS
+  NVM_VERSION_DIR_IOJS="$(nvm_version_dir iojs)"
+  local NVM_VERSION_DIR_NEW
+  NVM_VERSION_DIR_NEW="$(nvm_version_dir new)"
+  local NVM_VERSION_DIR_OLD
+  NVM_VERSION_DIR_OLD="$(nvm_version_dir old)"
 
   case "$PATTERN" in
-    "$(nvm_iojs_prefix)" | "$(nvm_node_prefix)")
+    "$NVM_IOJS_PREFIX" | "$NVM_NODE_PREFIX" )
       PATTERN="$PATTERN-"
     ;;
     *)
+      if nvm_resolve_local_alias "$PATTERN"; then
+        return
+      fi
       PATTERN=$(nvm_ensure_version_prefix $PATTERN)
     ;;
   esac
   # If it looks like an explicit version, don't do anything funny
-  if [ "_$(echo "$PATTERN" | cut -c1-1)" = "_v" ] && [ "_$(nvm_num_version_groups "$PATTERN")" = "_3" ]; then
+  local NVM_PATTERN_STARTS_WITH_V
+  case $PATTERN in
+    v*) NVM_PATTERN_STARTS_WITH_V=true ;;
+    *) NVM_PATTERN_STARTS_WITH_V=false ;;
+  esac
+  if [ $NVM_PATTERN_STARTS_WITH_V = true ] && [ "_$(nvm_num_version_groups "$PATTERN")" = "_3" ]; then
     if [ -d "$(nvm_version_path "$PATTERN")" ]; then
       VERSIONS="$PATTERN"
+    elif [ -d "$(nvm_version_path "$(nvm_add_iojs_prefix "$PATTERN")")" ]; then
+      VERSIONS="$(nvm_add_iojs_prefix "$PATTERN")"
     fi
   else
     case "$PATTERN" in
-      "$(nvm_iojs_prefix)-" | "$(nvm_node_prefix)-" | "system")
+      "$NVM_IOJS_PREFIX-" | "$NVM_NODE_PREFIX-" | "system") ;;
-      ;;
       *)
         local NUM_VERSION_GROUPS
         NUM_VERSION_GROUPS="$(nvm_num_version_groups "$PATTERN")"
         if [ "_$NUM_VERSION_GROUPS" = "_2" ] || [ "_$NUM_VERSION_GROUPS" = "_1" ]; then
-          PATTERN="$(echo "$PATTERN" | command sed -e 's/\.*$//g')."
+          PATTERN="${PATTERN%.}."
         fi
       ;;
     esac
@@ -495,19 +588,19 @@ nvm_ls() {
     local NVM_ADD_SYSTEM
     NVM_ADD_SYSTEM=false
     if nvm_is_iojs_version "$PATTERN"; then
-      NVM_DIRS_TO_TEST_AND_SEARCH="$(nvm_version_dir iojs)"
+      NVM_DIRS_TO_TEST_AND_SEARCH="$NVM_VERSION_DIR_IOJS"
       PATTERN="$(nvm_strip_iojs_prefix "$PATTERN")"
       if nvm_has_system_iojs; then
         NVM_ADD_SYSTEM=true
       fi
-    elif [ "_$PATTERN" = "_$(nvm_node_prefix)-" ]; then
+    elif [ "_$PATTERN" = "_$NVM_NODE_PREFIX-" ]; then
-      NVM_DIRS_TO_TEST_AND_SEARCH="$(nvm_version_dir old) $(nvm_version_dir new)"
+      NVM_DIRS_TO_TEST_AND_SEARCH="$NVM_VERSION_DIR_OLD $NVM_VERSION_DIR_NEW"
       PATTERN=''
       if nvm_has_system_node; then
         NVM_ADD_SYSTEM=true
       fi
     else
-      NVM_DIRS_TO_TEST_AND_SEARCH="$(nvm_version_dir old) $(nvm_version_dir new) $(nvm_version_dir iojs)"
+      NVM_DIRS_TO_TEST_AND_SEARCH="$NVM_VERSION_DIR_OLD $NVM_VERSION_DIR_NEW $NVM_VERSION_DIR_IOJS"
       if nvm_has_system_iojs || nvm_has_system_node; then
         NVM_ADD_SYSTEM=true
       fi
@@ -521,17 +614,23 @@ nvm_ls() {
     if [ -z "$PATTERN" ]; then
       PATTERN='v'
     fi
-    VERSIONS="$(command find $NVM_DIRS_TO_SEARCH -maxdepth 1 -type d -name "$PATTERN*" \
+    if [ -n "$NVM_DIRS_TO_SEARCH" ]; then
-      | command sed "s#$(nvm_version_dir iojs)/#"$(nvm_iojs_prefix)"-#" \
+      VERSIONS="$(command find $NVM_DIRS_TO_SEARCH -maxdepth 1 -type d -name "$PATTERN*" \
-      | command sed "s#^$NVM_DIR/##" \
+        | command sed "
-      | command grep -v -e '^versions$' \
+            s#$NVM_VERSION_DIR_IOJS/#$NVM_IOJS_PREFIX-#;
-      | command sed 's#^versions/##' \
+            \#$NVM_VERSION_DIR_IOJS# d;
-      | sed -e 's/^v/node-v/' \
+            s#^$NVM_DIR/##;
-      | sed -e 's#^\(iojs\)[-/]v#\1.v#' | sed -e 's#^\(node\)[-/]v#\1.v#' \
+            \#^versions\$# d;
-      | command sort -t. -u -k 2.2,2n -k 3,3n -k 4,4n \
+            s#^versions/##;
-      | command sort -s -t- -k1.1,1.1 \
+            s#^v#$NVM_NODE_PREFIX-v#;
-      | command sed 's/^\(iojs\)\./\1-/' \
+            s#^\($NVM_IOJS_PREFIX\)[-/]v#\1.v#;
-      | command sed 's/^node\.//')"
+            s#^\($NVM_NODE_PREFIX\)[-/]v#\1.v#" \
+        | command sort -t. -u -k 2.2,2n -k 3,3n -k 4,4n \
+        | command sort -s -t- -k1.1,1.1 \
+        | command sed "
+            s/^\($NVM_IOJS_PREFIX\)\./\1-/;
+            s/^$NVM_NODE_PREFIX\.//")"
+    fi
 
     if [ $ZHS_HAS_SHWORDSPLIT_UNSET -eq 1 ] && nvm_has "unsetopt"; then
       unsetopt shwordsplit
@@ -588,9 +687,10 @@ nvm_ls_remote_iojs() {
     PATTERN=".*"
   fi
   VERSIONS="$(nvm_download -L -s $NVM_IOJS_ORG_VERSION_LISTING -o - \
-    | command sed 1d \
+    | command sed "
-    | command sed "s/^/$(nvm_iojs_prefix)-/" \
+        1d;
-    | command cut -f1 \
+        s/^/$(nvm_iojs_prefix)-/;
+        s/[[:blank:]].*//" \
     | command grep -w "$PATTERN" \
     | command sort)"
   if [ -z "$VERSIONS" ]; then
@@ -601,15 +701,19 @@ nvm_ls_remote_iojs() {
 }
 
 nvm_checksum() {
-  if nvm_has "sha1sum"; then
+  local NVM_CHECKSUM
-    checksum="$(sha1sum "$1" | command awk '{print $1}')"
+  if nvm_has "sha1sum" && ! nvm_is_alias "sha1sum"; then
-  elif nvm_has "sha1"; then
+    NVM_CHECKSUM="$(command sha1sum "$1" | command awk '{print $1}')"
-    checksum="$(sha1 -q "$1")"
+  elif nvm_has "sha1" && ! nvm_is_alias "sha1"; then
+    NVM_CHECKSUM="$(command sha1 -q "$1")"
+  elif nvm_has "shasum" && ! nvm_is_alias "shasum"; then
+    NVM_CHECKSUM="$(shasum "$1" | command awk '{print $1}')"
   else
-    checksum="$(shasum "$1" | command awk '{print $1}')"
+    echo "Unaliased sha1sum, sha1, or shasum not found." >&2
+    return 2
   fi
 
-  if [ "_$checksum" = "_$2" ]; then
+  if [ "_$NVM_CHECKSUM" = "_$2" ]; then
     return
   elif [ -z "$2" ]; then
     echo 'Checksums empty' #missing in raspberry pi binary
@@ -640,10 +744,20 @@ nvm_print_versions() {
 }
 
 nvm_validate_implicit_alias() {
-  if [ "_$1" != "_stable" ] && [ "_$1" != "_unstable" ]; then
+  local NVM_IOJS_PREFIX
-    echo "Only implicit aliases 'stable' and 'unstable' are supported." >&2
+  NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-    return 1
+  local NVM_NODE_PREFIX
-  fi
+  NVM_NODE_PREFIX="$(nvm_node_prefix)"
+
+  case "$1" in
+    "stable" | "unstable" | "$NVM_IOJS_PREFIX" | "$NVM_NODE_PREFIX" )
+      return
+    ;;
+    *)
+      echo "Only implicit aliases 'stable', 'unstable', '$NVM_IOJS_PREFIX', and '$NVM_NODE_PREFIX' are supported." >&2
+      return 1
+    ;;
+  esac
 }
 
 nvm_print_implicit_alias() {
@@ -656,18 +770,67 @@ nvm_print_implicit_alias() {
     return 2
   fi
 
+  local ZHS_HAS_SHWORDSPLIT_UNSET
+
+  local NVM_IOJS_PREFIX
+  NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
+  local NVM_NODE_PREFIX
+  NVM_NODE_PREFIX="$(nvm_node_prefix)"
+  local NVM_COMMAND
   local LAST_TWO
-  if [ "_$1" = "_local" ]; then
+  case "$2" in
-    LAST_TWO=$(nvm_ls | command grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
+    "$NVM_IOJS_PREFIX")
-  else
+      NVM_COMMAND="nvm_ls_remote_iojs"
-    LAST_TWO=$(nvm_ls_remote | command grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
+      if [ "_$1" = "_local" ]; then
-  fi
+        NVM_COMMAND="nvm_ls iojs"
+      fi
+
+      ZHS_HAS_SHWORDSPLIT_UNSET=1
+      if nvm_has "setopt"; then
+        ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
+        setopt shwordsplit
+      fi
+
+      local NVM_IOJS_VERSION
+      NVM_IOJS_VERSION="$($NVM_COMMAND | sed "s/^"$NVM_IOJS_PREFIX"-//" | command grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq | tail -1)"
+      local EXIT_CODE
+      EXIT_CODE="$?"
+
+      if [ $ZHS_HAS_SHWORDSPLIT_UNSET -eq 1 ] && nvm_has "unsetopt"; then
+        unsetopt shwordsplit
+      fi
+
+      echo "$(nvm_add_iojs_prefix "$NVM_IOJS_VERSION")"
+      return $EXIT_CODE
+    ;;
+    "$NVM_NODE_PREFIX")
+      echo "stable"
+      return
+    ;;
+    *)
+      NVM_COMMAND="nvm_ls_remote"
+      if [ "_$1" = "_local" ]; then
+        NVM_COMMAND="nvm_ls node"
+      fi
+
+      ZHS_HAS_SHWORDSPLIT_UNSET=1
+      if nvm_has "setopt"; then
+        ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
+        setopt shwordsplit
+      fi
+
+      LAST_TWO=$($NVM_COMMAND | command grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
+
+      if [ $ZHS_HAS_SHWORDSPLIT_UNSET -eq 1 ] && nvm_has "unsetopt"; then
+        unsetopt shwordsplit
+      fi
+    ;;
+  esac
   local MINOR
   local STABLE
   local UNSTABLE
   local MOD
 
-  local ZHS_HAS_SHWORDSPLIT_UNSET
   ZHS_HAS_SHWORDSPLIT_UNSET=1
   if nvm_has "setopt"; then
     ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
@@ -712,12 +875,30 @@ nvm_get_arch() {
   case "$NVM_UNAME" in
     *x86_64*) NVM_ARCH=x64 ;;
     *i*86*) NVM_ARCH=x86 ;;
-    *armv6l*) NVM_ARCH=arm-pi ;;
     *) NVM_ARCH="$(uname -m)" ;;
   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"
@@ -790,7 +971,12 @@ nvm_install_node_binary() {
 
   if [ -n "$NVM_OS" ]; then
     if nvm_binary_available "$VERSION"; then
-      t="$VERSION-$NVM_OS-$(nvm_get_arch)"
+      local NVM_ARCH
+      NVM_ARCH="$(nvm_get_arch)"
+      if [ $NVM_ARCH = "armv6l" ] || [ $NVM_ARCH = "armv7l" ]; then
+         NVM_ARCH="arm-pi"
+      fi
+      t="$VERSION-$NVM_OS-$NVM_ARCH"
       url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz"
       sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | command grep node-${t}.tar.gz | command awk '{print $1}'`
       local tmpdir
@@ -820,10 +1006,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"
@@ -869,9 +1053,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
@@ -961,8 +1142,8 @@ nvm() {
         version_not_provided=1
         nvm_rc_version
         if [ -z "$NVM_RC_VERSION" ]; then
-          nvm help
+          >&2 nvm help
-          return
+          return 127
         fi
       fi
 
@@ -998,15 +1179,19 @@ nvm() {
 
       while [ $# -ne 0 ]
       do
-        if [ "_$(echo "$1" | command cut -c 1-26)" = "_--reinstall-packages-from=" ]; then
+        case "$1" in
-          PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 27-)"
+          --reinstall-packages-from=*)
-          REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")"
+            PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 27-)"
-        elif [ "_$(echo "$1" | command cut -c 1-21)" = "_--copy-packages-from=" ]; then
+            REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")"
-          PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 22-)"
+          ;;
-          REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")"
+          --copy-packages-from=*)
-        else
+            PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 22-)"
-          ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
+            REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")"
-        fi
+          ;;
+          *)
+            ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
+          ;;
+        esac
         shift
       done
 
@@ -1040,49 +1225,49 @@ 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
+      elif [ "$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
 
-        if [ "$NVM_INSTALL_SUCCESS" = true ] \
+      if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then
-          && nvm use "$VERSION" \
+        if [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
-          && [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
           && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
           nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
         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
+      return $?
     ;;
     "uninstall" )
-      [ $# -ne 2 ] && nvm help && return
+      if [ $# -ne 2 ]; then
+        >&2 nvm help
+        return 127
+      fi
 
       local PATTERN
       PATTERN="$2"
-      local VERSION
       case "_$PATTERN" in
         "_$(nvm_iojs_prefix)" | "_$(nvm_iojs_prefix)-" \
         | "_$(nvm_node_prefix)" | "_$(nvm_node_prefix)-")
-          VERSION="$(nvm_version $PATTERN)"
+          VERSION="$(nvm_version "$PATTERN")"
         ;;
         *)
           VERSION="$(nvm_version "$PATTERN")"
         ;;
       esac
-      if [ "_$PATTERN" = "_$(nvm_ls_current)" ]; then
+      if [ "_$VERSION" = "_$(nvm_ls_current)" ]; then
-        if nvm_is_iojs_version "$PATTERN"; then
+        if nvm_is_iojs_version "$VERSION"; then
           echo "nvm: Cannot uninstall currently-active io.js version, $VERSION (inferred from $PATTERN)." >&2
         else
           echo "nvm: Cannot uninstall currently-active node version, $VERSION (inferred from $PATTERN)." >&2
@@ -1148,62 +1333,64 @@ nvm() {
       fi
     ;;
     "use" )
-      if [ $# -eq 0 ]; then
+      local PROVIDED_VERSION
-        nvm help
-        return 127
-      fi
-
       if [ $# -eq 1 ]; then
         nvm_rc_version
         if [ -n "$NVM_RC_VERSION" ]; then
-          VERSION="$(nvm_version "$NVM_RC_VERSION")"
+          PROVIDED_VERSION="$NVM_RC_VERSION"
+          VERSION="$(nvm_version "$PROVIDED_VERSION")"
         fi
       else
         local NVM_IOJS_PREFIX
         NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-        case "_$2" in
+        local NVM_NODE_PREFIX
+        NVM_NODE_PREFIX="$(nvm_node_prefix)"
+        PROVIDED_VERSION="$2"
+        case "_$PROVIDED_VERSION" in
           "_$NVM_IOJS_PREFIX" | "_io.js")
-            VERSION="$(nvm_add_iojs_prefix $(nvm_ls | command grep "$NVM_IOJS_PREFIX" | tail -n1))"
+            VERSION="$(nvm_version $NVM_IOJS_PREFIX)"
-          ;;
-          "_$(nvm_node_prefix)")
-            VERSION="$(nvm_version stable)"
           ;;
           "_system")
             VERSION="system"
           ;;
           *)
-            VERSION="$(nvm_version "$2")"
+            VERSION="$(nvm_version "$PROVIDED_VERSION")"
           ;;
         esac
       fi
 
       if [ -z "$VERSION" ]; then
-        nvm help
+        >&2 nvm help
         return 127
       fi
 
       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
           return 127
         fi
       elif [ "_$VERSION" = "_∞" ]; then
-        echo "The alias \"$2\" leads to an infinite loop. Aborting." >&2
+        echo "The alias \"$PROVIDED_VERSION\" leads to an infinite loop. Aborting." >&2
         return 8
       fi
 
+      # This nvm_ensure_version_installed call can be a performance bottleneck
+      # on shell startup. Perhaps we can optimize it away or make it faster.
+      nvm_ensure_version_installed "$PROVIDED_VERSION"
+      EXIT_CODE=$?
+      if [ "$EXIT_CODE" != "0" ]; then
+        return $EXIT_CODE
+      fi
+
       local NVM_VERSION_DIR
       NVM_VERSION_DIR="$(nvm_version_path "$VERSION")"
-      if [ ! -d "$NVM_VERSION_DIR" ]; then
+
-        echo "$VERSION version is not installed yet" >&2
-        return 1
-      fi
       # Strip other version from PATH
       PATH="$(nvm_strip_path "$PATH" "/bin")"
       # Prepend current version
@@ -1226,9 +1413,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" )
@@ -1245,7 +1432,7 @@ nvm() {
           VERSION='N/A'
         fi
         if [ $VERSION = "N/A" ]; then
-          nvm help
+          >&2 nvm help
           return 127
         fi
       fi
@@ -1253,7 +1440,7 @@ nvm() {
       provided_version=$1
       if [ -n "$provided_version" ]; then
         VERSION="$(nvm_version "$provided_version")"
-        if [ "_$VERSION" = "_N/A" ]; then
+        if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then
           provided_version=''
           if [ $has_checked_nvmrc -ne 1 ]; then
             nvm_rc_version && has_checked_nvmrc=1
@@ -1272,17 +1459,39 @@ nvm() {
       local ARGS
       ARGS="$@"
       local OUTPUT
+      local EXIT_CODE
 
-      if [ "$NVM_IOJS" = true ]; then
+      local ZHS_HAS_SHWORDSPLIT_UNSET
+      ZHS_HAS_SHWORDSPLIT_UNSET=1
+      if nvm_has "setopt"; then
+        ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
+        setopt shwordsplit
+      fi
+      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")"
+        OUTPUT="$(nvm use "$VERSION" >/dev/null && iojs $ARGS)"
+        EXIT_CODE="$?"
       else
         echo "Running node $VERSION"
-        OUTPUT="$(nvm use "$VERSION" >/dev/null && node "$ARGS")"
+        OUTPUT="$(nvm use "$VERSION" >/dev/null && node $ARGS)"
+        EXIT_CODE="$?"
+      fi
+      if [ $ZHS_HAS_SHWORDSPLIT_UNSET -eq 1 ] && nvm_has "unsetopt"; then
+        unsetopt shwordsplit
+      fi
+      if [ -n "$OUTPUT" ]; then
+        echo "$OUTPUT"
       fi
-      local EXIT_CODE
-      EXIT_CODE="$?"
-      echo "$OUTPUT"
       return $EXIT_CODE
     ;;
     "exec" )
@@ -1293,20 +1502,20 @@ nvm() {
       if [ -n "$provided_version" ]; then
         VERSION="$(nvm_version "$provided_version")"
         if [ "_$VERSION" = "_N/A" ]; then
-          provided_version=''
           nvm_rc_version
-          VERSION="$(nvm_version "$NVM_RC_VERSION")"
+          provided_version="$NVM_RC_VERSION"
+          VERSION="$(nvm_version "$provided_version")"
         else
           shift
         fi
       fi
 
-      local NVM_VERSION_DIR
+      nvm_ensure_version_installed "$provided_version"
-      NVM_VERSION_DIR="$(nvm_version_path "$VERSION")"
+      EXIT_CODE=$?
-      if [ ! -d "$NVM_VERSION_DIR" ]; then
+      if [ "$EXIT_CODE" != "0" ]; then
-        echo "$VERSION version is not installed yet" >&2
+        return $EXIT_CODE
-        return 1
       fi
+
       echo "Running node $VERSION"
       NODE_VERSION="$VERSION" $NVM_DIR/nvm-exec "$@"
     ;;
@@ -1365,18 +1574,21 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       nvm_version current
     ;;
     "which" )
+      local provided_version
+      provided_version="$2"
       if [ $# -eq 1 ]; then
         nvm_rc_version
         if [ -n "$NVM_RC_VERSION" ]; then
+          provided_version="$NVM_RC_VERSION"
           VERSION=$(nvm_version "$NVM_RC_VERSION")
         fi
       elif [ "_$2" != '_system' ]; then
-        VERSION="$(nvm_version "$2")"
+        VERSION="$(nvm_version "$provided_version")"
       else
         VERSION="$2"
       fi
       if [ -z "$VERSION" ]; then
-        nvm help
+        >&2 nvm help
         return 127
       fi
 
@@ -1399,12 +1611,13 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
         return 8
       fi
 
+      nvm_ensure_version_installed "$provided_version"
+      EXIT_CODE=$?
+      if [ "$EXIT_CODE" != "0" ]; then
+        return $EXIT_CODE
+      fi
       local NVM_VERSION_DIR
       NVM_VERSION_DIR="$(nvm_version_path "$VERSION")"
-      if [ ! -d "$NVM_VERSION_DIR" ]; then
-        echo "$VERSION version is not installed yet" >&2
-        return 1
-      fi
       echo "$NVM_VERSION_DIR/bin/node"
     ;;
     "alias" )
@@ -1426,7 +1639,7 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
           fi
         done
 
-        for ALIAS in "stable" "unstable"; do
+        for ALIAS in "$(nvm_node_prefix)" "stable" "unstable" "$(nvm_iojs_prefix)"; do
           if [ ! -f "$NVM_ALIAS_DIR/$ALIAS" ]; then
             if [ $# -lt 2 ] || [ "~$ALIAS" = "~$2" ]; then
               DEST="$(nvm_print_implicit_alias local "$ALIAS")"
@@ -1448,7 +1661,7 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       if [ $? -ne 0 ]; then
         echo "! WARNING: Version '$3' does not exist." >&2
       fi
-      echo "$3" | tee "$NVM_ALIAS_DIR/$2"
+      echo "$3" | tee "$NVM_ALIAS_DIR/$2" >/dev/null
       if [ ! "_$3" = "_$VERSION" ]; then
         echo "$2 -> $3 (-> $VERSION)"
       else
@@ -1459,14 +1672,17 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       local NVM_ALIAS_DIR
       NVM_ALIAS_DIR="$(nvm_alias_path)"
       command mkdir -p "$NVM_ALIAS_DIR"
-      [ $# -ne 2 ] && nvm help && return 127
+      if [ $# -ne 2 ]; then
+        >&2 nvm help
+        return 127
+      fi
       [ ! -f "$NVM_ALIAS_DIR/$2" ] && echo "Alias $2 doesn't exist!" >&2 && return
       command rm -f "$NVM_ALIAS_DIR/$2"
       echo "Deleted alias $2"
     ;;
     "reinstall-packages" | "copy-packages" )
       if [ $# -ne 2 ]; then
-        nvm help
+        >&2 nvm help
         return 127
       fi
 
@@ -1478,21 +1694,32 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
         return 2
       fi
 
-      local INSTALLS
+      local NPMLIST
       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
-        INSTALLS=$(nvm deactivate > /dev/null && npm list -g --depth=0 | command tail -n +2 | command grep -o -e ' [^@]*' | command cut -c 2- | command grep -v npm | command xargs)
+        NPMLIST=$(nvm deactivate > /dev/null && npm list -g --depth=0 | command tail -n +2)
       else
         local VERSION
         VERSION="$(nvm_version "$PROVIDED_VERSION")"
-        INSTALLS=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 | command tail -n +2 | command grep -o -e ' [^@]*' | command cut -c 2- | command grep -v npm | command xargs)
+        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)
+
       echo "Copying global packages from $VERSION..."
       echo "$INSTALLS" | command xargs npm install -g --quiet
+
+      local LINKS
+      LINKS=$(echo "$NPMLIST" | command sed -n 's/.* -> \(.*\)/\1/ p')
+
+      echo "Linking global packages from $VERSION..."
+      for LINK in $LINKS; do
+        (cd "$LINK" && npm link)
+      done
     ;;
     "clear-cache" )
       command rm -f $NVM_DIR/v* "$(nvm_version_dir)" 2>/dev/null
@@ -1502,7 +1729,7 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       nvm_version $2
     ;;
     "--version" )
-      echo "0.23.1"
+      echo "0.25.0"
     ;;
     "unload" )
       unset -f nvm nvm_print_versions nvm_checksum \
@@ -1516,25 +1743,25 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       unset RC_VERSION NVM_NODEJS_ORG_MIRROR NVM_DIR NVM_CD_FLAGS > /dev/null 2>&1
     ;;
     * )
-      nvm help
+      >&2 nvm help
+      return 127
     ;;
   esac
 }
 
 nvm_supports_source_options() {
-  [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
+  [ "_$(echo 'echo $1' | . /dev/stdin yes 2> /dev/null)" = "_yes" ]
 }
 
+VERSION="$(nvm_alias default 2>/dev/null)"
 if nvm_supports_source_options && [ "_$1" = "_--install" ]; then
-  VERSION="$(nvm_alias default 2>/dev/null)"
   if [ -n "$VERSION" ]; then
     nvm install "$VERSION" >/dev/null
   elif nvm_rc_version >/dev/null 2>&1; then
     nvm install >/dev/null
   fi
-elif nvm ls default >/dev/null; then
+elif [ -n "$VERSION" ]; then
-  nvm use default >/dev/null
+  nvm use "$VERSION" >/dev/null
 elif nvm_rc_version >/dev/null 2>&1; then
   nvm use >/dev/null
 fi
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.23.1",
+  "version": "0.25.0",
   "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",
+    "replace": "^0.3.0",
-    "semver": "~4.2.0",
+    "semver": "^4.3.3",
-    "urchin": "~0.0.5"
+    "urchin": "^0.0.5"
   }
 }

test/fast/Aliases/Running "nvm alias" lists implicit aliases when they do not exist

@@ -11,8 +11,16 @@ STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
 echo "$NVM_ALIAS_OUTPUT" | \grep -e "^stable -> $EXPECTED_STABLE (-> $STABLE_VERSION) (default)$" \
   || die "nvm alias did not contain the default local stable node version"
 
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^node -> stable (-> $STABLE_VERSION) (default)$" \
+  || die "nvm alias did not contain the default local stable node version under 'node'"
+
 EXPECTED_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
 UNSTABLE_VERSION="$(nvm_version "$EXPECTED_UNSTABLE")"
 echo "$NVM_ALIAS_OUTPUT" | \grep -e "^unstable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION) (default)$" \
   || die "nvm alias did not contain the default local unstable node version"
 
+EXPECTED_IOJS="$(nvm_print_implicit_alias local iojs)"
+IOJS_VERSION="$(nvm_version "$EXPECTED_IOJS")"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^iojs -> $EXPECTED_IOJS (-> $IOJS_VERSION) (default)$" \
+  || die "nvm alias did not contain the default local iojs version"
+

test/fast/Aliases/Running "nvm alias" lists manual aliases instead of implicit aliases when present

@@ -6,12 +6,16 @@ die () { echo $@ ; cleanup ; exit 1; }
 cleanup () {
   rm -rf ../../../alias/stable
   rm -rf ../../../alias/unstable
+  rm -rf ../../../alias/node
+  rm -rf ../../../alias/iojs
   rm -rf ../../../v0.8.1
   rm -rf ../../../v0.9.1
+  rm -rf ../../../versions/io.js/v0.2.1
 }
 
 mkdir ../../../v0.8.1
 mkdir ../../../v0.9.1
+mkdir -p ../../../versions/io.js/v0.2.1
 
 EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
 STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
@@ -24,14 +28,22 @@ UNSTABLE_VERSION="$(nvm_version "$EXPECTED_UNSTABLE")"
 
 nvm alias stable "$EXPECTED_UNSTABLE"
 nvm alias unstable "$EXPECTED_STABLE"
+nvm alias node stable
+nvm alias iojs unstable
 
 NVM_ALIAS_OUTPUT=$(nvm alias)
 
-echo "$NVM_ALIAS_OUTPUT" | \grep -e "^stable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION)$" \
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^stable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION)$" \
   || die "nvm alias did not contain the overridden 'stable' alias"
 
-echo "$NVM_ALIAS_OUTPUT" | \grep -e "^unstable -> $EXPECTED_STABLE (-> $STABLE_VERSION)$" \
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^unstable -> $EXPECTED_STABLE (-> $STABLE_VERSION)$" \
   || die "nvm alias did not contain the overridden 'unstable' alias"
 
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^node -> stable (-> $UNSTABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'node' alias"
+
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^iojs -> unstable (-> $STABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'iojs' alias"
+
 cleanup
 

test/fast/Aliases/circular/nvm_resolve_local_alias

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../../nvm.sh
+
+ALIAS="$(nvm_resolve_local_alias loopback)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias loopback was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias loopback)"
+EXPECTED_OUTPUT="loopback -> loopback (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias loopback was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias one)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias one was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias one)"
+EXPECTED_OUTPUT="one -> two (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias one was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias two)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias two was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias two)"
+EXPECTED_OUTPUT="two -> three (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias two was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias three)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias three was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias three)"
+EXPECTED_OUTPUT="three -> one (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias three was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias four)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias four was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias four)"
+EXPECTED_OUTPUT="four -> two (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias four was not $EXPECTED_OUTPUT; got $OUTPUT"
+

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/nvm_resolve_alias

@@ -21,8 +21,13 @@ EXIT_CODE=$(nvm_resolve_alias nonexistent ; echo $?)
 [ $EXIT_CODE = "2" ] || die "'nvm_resolve_alias nonexistent' did not return 2; got $EXIT_CODE"
 
 STABLE="$(nvm_resolve_alias stable)"
-[ "_$STABLE" = "_v0.0.10" ] || die "'nvm_resolve_alias stable' was not v0.0.10; got $STABLE"
+[ "_$STABLE" = "_v0.0" ] || die "'nvm_resolve_alias stable' was not v0.0; got $STABLE"
+
+NODE="$(nvm_resolve_alias node)"
+[ "_$NODE" = "_stable" ] || die "'nvm_resolve_alias node' was not stable; got $NODE"
 
 UNSTABLE="$(nvm_resolve_alias unstable)"
-[ "_$UNSTABLE" = "_v0.1.10" ] || die "'nvm_resolve_alias unstable' was not v0.1.10; got $UNSTABLE"
+[ "_$UNSTABLE" = "_v0.1" ] || die "'nvm_resolve_alias unstable' was not v0.1; got $UNSTABLE"
 
+IOJS="$(nvm_resolve_alias iojs)"
+[ "_$IOJS" = "_iojs-v0.2" ] || die "'nvm_resolve_alias iojs' was not iojs-v0.2; got $IOJS"

test/fast/Aliases/nvm_resolve_local_alias

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXIT_CODE=$(nvm_resolve_local_alias ; echo $?)
+[ "_$EXIT_CODE" = "_1" ] || die "nvm_resolve_local_alias without an argument did not return 1; got $EXIT_CODE"
+
+for i in $(seq 1 10)
+  do
+  STABLE_ALIAS="$(nvm_resolve_local_alias test-stable-$i)"
+  [ "_$STABLE_ALIAS" = "_v0.0.$i" ] \
+    || die "'nvm_resolve_local_alias test-stable-$i' was not v0.0.$i; got $STABLE_ALIAS"
+  UNSTABLE_ALIAS="$(nvm_resolve_local_alias test-unstable-$i)"
+  [ "_$UNSTABLE_ALIAS" = "_v0.1.$i" ] \
+    || die "'nvm_resolve_local_alias test-unstable-$i' was not v0.1.$i; got $UNSTABLE_ALIAS"
+done
+
+OUTPUT="$(nvm_resolve_local_alias nonexistent)"
+EXIT_CODE=$(nvm_resolve_local_alias nonexistent > /dev/null 2>&1 ; echo $?)
+[ "_$EXIT_CODE" = "_2" ] || die "'nvm_resolve_local_alias nonexistent' did not return 2; got $EXIT_CODE"
+[ "_$OUTPUT" = "_" ] || die "'nvm_resolve_local_alias nonexistent' did not have empty output; got $OUTPUT"
+
+STABLE="$(nvm_resolve_local_alias stable)"
+[ "_$STABLE" = "_v0.0.10" ] || die "'nvm_resolve_local_alias stable' was not v0.0.10; got $STABLE"
+
+NODE="$(nvm_resolve_local_alias node)"
+[ "_$NODE" = "_v0.0.10" ] || die "'nvm_resolve_local_alias node' was not v0.0.10; got $NODE"
+
+UNSTABLE="$(nvm_resolve_local_alias unstable)"
+[ "_$UNSTABLE" = "_v0.1.10" ] || die "'nvm_resolve_local_alias unstable' was not v0.1.10; got $UNSTABLE"
+
+IOJS="$(nvm_resolve_local_alias iojs)"
+[ "_$IOJS" = "_iojs-v0.2.10" ] || die "'nvm_resolve_local_alias iojs' was not iojs-v0.2.10; got $IOJS"

test/fast/Aliases/setup

@@ -6,4 +6,6 @@ for i in $(seq 1 10)
   mkdir -p ../../../v0.0.$i
   echo 0.1.$i > ../../../alias/test-unstable-$i
   mkdir -p ../../../v0.1.$i
+  echo 0.2.$i > ../../../alias/test-iojs-$i
+  mkdir -p ../../../versions/io.js/v0.2.$i
 done

test/fast/Aliases/teardown

@@ -6,8 +6,12 @@ for i in $(seq 1 10)
   rm -rf "../../../v0.0.$i"
   rm -f "../../../alias/test-unstable-$i"
   rm -rf "../../../v0.1.$i"
+  rm -rf "../../../alias/test-iojs-$i"
+  rm -rf "../../../versions/io.js/v0.2.$i"
 done
 
 rm -f "../../../alias/stable"
 rm -f "../../../alias/unstable"
-
+rm -f "../../../alias/node"
+rm -f "../../../alias/iojs"
+rm -f "../../../alias/default"

test/fast/Listing versions/Running "nvm ls io" should return NA

@@ -0,0 +1,7 @@
+ #!/bin/sh
+
+. ../../../nvm.sh
+
+nvm ls io
+[ "$?" = "3" ]
+

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_ensure_version_installed

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+cleanup () {
+  rm -rf "$(nvm_version_path v0.1.2)"
+}
+
+. ../../../nvm.sh
+
+mkdir -p "$(nvm_version_path v0.1.2)"
+
+OUTPUT="$(nvm_ensure_version_installed foo 2>&1)"
+EXIT_CODE=$?
+EXPECTED_OUTPUT='N/A: version "foo" is not yet installed'
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "expected 'nvm_ensure_version_installed foo' to give $EXPECTED_OUTPUT, got $OUTPUT"
+[ "_$EXIT_CODE" = "_1" ] || die "expected 'nvm_ensure_version_installed foo' to exit with 1, got $EXIT_CODE"
+
+OUTPUT="$(nvm_ensure_version_installed 0.1)"
+EXIT_CODE=$?
+[ "_$OUTPUT" = "_" ] || die "expected 'nvm_ensure_version_installed 0.1' to have no output, got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "expected 'nvm_ensure_version_installed 0.1' to exit with 0, got $EXIT_CODE"
+
+cleanup

test/fast/Unit tests/nvm_is_alias

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cleanup () { unalias foo; unalias grep; }
+die () { echo $@ ; cleanup ; exit 1; }
+
+. ../../../nvm.sh
+
+alias foo='bar'
+nvm_is_alias foo || die '"nvm_is_alias foo" was not true'
+
+! nvm_is_alias nvm_is_alias || die '"nvm_is_alias nvm_is_alias was not false'
+
+alias grep='grep'
+unalias grep || die '"unalias grep" failed'
+! nvm_is_alias grep || die '"nvm_is_alias grep" with unaliased grep was not false'
+
+alias grep='grep'
+nvm_is_alias grep || die '"nvm_is_alias grep" with aliased grep was not true'
+
+cleanup

test/fast/Unit tests/nvm_is_valid_version

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm_is_valid_version 0.1.2 || die "nvm_is_valid_version 0.1.2 did not return 0"
+nvm_is_valid_version foo && die "nvm_is_valid_version foo did not return 1"
+nvm_is_valid_version iojs-1 || die "nvm_is_valid_version iojs-1 did not return 0"
+nvm_is_valid_version iojs || die "nvm_is_valid_version iojs did not return 0"
+nvm_is_valid_version node || die "nvm_is_valid_version node did not return 0"
+nvm_is_valid_version stable || die "nvm_is_valid_version stable did not return 0"
+nvm_is_valid_version unstable || die "nvm_is_valid_version unstable did not return 0"

test/fast/Unit tests/nvm_ls_current

@@ -3,14 +3,19 @@
 TEST_PWD=$(pwd)
 TEST_DIR="$TEST_PWD/nvm_ls_current_tmp"
 
-cleanup() { rm -rf "$TEST_DIR"; unset -f return_zero; unalias node; }
+cleanup() { rm -rf "$TEST_DIR"; unset -f return_zero; alias node='node' ; unalias node; }
 die () { echo $@ ; cleanup ; exit 1; }
 
 . ../../../nvm.sh
 
 return_zero () { return 0; }
 
-[ "$(nvm deactivate > /dev/null 2>&1 ; nvm_ls_current)" = "system" ] || die 'when deactivated, did not return "system"'
+if nvm_has_system_node || nvm_has_system_iojs; then
+  EXPECTED_SYSTEM_NODE="system"
+else
+  EXPECTED_SYSTEM_NODE="none"
+fi
+[ "_$(nvm deactivate > /dev/null 2>&1 ; nvm_ls_current)" = "_$EXPECTED_SYSTEM_NODE" ] || die "when deactivated, did not return $EXPECTED_SYSTEM_NODE"
 
 rm -rf "$TEST_DIR"
 mkdir "$TEST_DIR"

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_implicit_alias errors

@@ -14,13 +14,13 @@ FIRST_EXIT_CODE="$(nvm_print_implicit_alias > /dev/null 2>&1 ; echo $?)"
 [ "_$FIRST_EXIT_CODE" = "_1" ] \
   || die "nvm_print_implicit_alias without local|remote had wrong exit code: expected 1, got $FIRST_EXIT_CODE"
 
-EXPECTED_SECOND_MSG="Only implicit aliases 'stable' and 'unstable' are supported."
+EXPECTED_SECOND_MSG="Only implicit aliases 'stable', 'unstable', 'iojs', and 'node' are supported."
 [ "_$(nvm_print_implicit_alias local 2>&1)" = "_$EXPECTED_SECOND_MSG" ] \
-  || die "nvm_print_implicit_alias did not require stable|unstable as second argument"
+  || die "nvm_print_implicit_alias did not require stable|unstable|iojs|node as second argument"
 [ "_$(nvm_print_implicit_alias local foo 2>&1)" = "_$EXPECTED_SECOND_MSG" ] \
-  || die "nvm_print_implicit_alias did not require stable|unstable as second argument"
+  || die "nvm_print_implicit_alias did not require stable|unstable|iojs|node as second argument"
 
 SECOND_EXIT_CODE="$(nvm_print_implicit_alias local > /dev/null 2>&1 ; echo $?)"
 [ "_$SECOND_EXIT_CODE" = "_2" ] \
-  || die "nvm_print_implicit_alias without stable|unstable had wrong exit code: expected 2, got $SECOND_EXIT_CODE"
+  || die "nvm_print_implicit_alias without stable|unstable|iojs|node had wrong exit code: expected 2, got $SECOND_EXIT_CODE"
 

test/fast/Unit tests/nvm_print_implicit_alias success

@@ -7,7 +7,8 @@ cleanup() {
   rm -rf ../../../v0.4.6
   rm -rf ../../../v0.5.7
   rm -rf ../../../v0.7.7
-  unset -f nvm_ls_remote
+  rm -rf ../../../versions/io.js/v0.98.0
+  unset -f nvm_ls_remote nvm_ls_remote_iojs
 }
 
 . ../../../nvm.sh
@@ -17,13 +18,20 @@ mkdir ../../../v0.3.4
 mkdir ../../../v0.4.6
 mkdir ../../../v0.5.7
 mkdir ../../../v0.7.7
+mkdir -p ../../../versions/io.js/v0.98.0
 
 LATEST_STABLE="$(nvm_print_implicit_alias local stable)"
 [ "_$LATEST_STABLE" = "_0.4" ] || die "local stable is not latest even minor: expected 0.4, got $LATEST_STABLE"
 
+LATEST_NODE="$(nvm_print_implicit_alias local node)"
+[ "_$LATEST_NODE" = "_stable" ] || die "local node is not stable: expected stable, got $LATEST_NODE"
+
 LATEST_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
 [ "_$LATEST_UNSTABLE" = "_0.7" ] || die "local unstable is not latest odd minor: expected 0.7, got $LATEST_UNSTABLE"
 
+LATEST_IOJS="$(nvm_print_implicit_alias local iojs)"
+[ "_$LATEST_IOJS" = "_iojs-v0.98" ] || die "local iojs is not latest iojs: expected iojs-v0.98, got $LATEST_IOJS"
+
 nvm_ls_remote() {
   echo "v0.4.3"
   echo "v0.5.4"
@@ -37,11 +45,25 @@ nvm_ls_remote() {
   echo "v0.9.7"
 }
 
+nvm_ls_remote_iojs() {
+  echo "iojs-v0.1.0"
+  echo "iojs-v0.1.1"
+  echo "iojs-v0.7.8"
+  echo "iojs-v0.98.5"
+  echo "iojs-v0.99.0"
+}
+
 LATEST_STABLE="$(nvm_print_implicit_alias remote stable)"
 [ "_$LATEST_STABLE" = "_0.6" ] || die "remote stable is not latest even minor: expected 0.6, got $LATEST_STABLE"
 
+LATEST_NODE="$(nvm_print_implicit_alias remote node)"
+[ "_$LATEST_NODE" = "_stable" ] || die "remote node is not stable: expected stable, got $LATEST_NODE"
+
 LATEST_UNSTABLE="$(nvm_print_implicit_alias remote unstable)"
 [ "_$LATEST_UNSTABLE" = "_0.9" ] || die "remote unstable is not latest odd minor: expected 0.9, got $LATEST_UNSTABLE"
 
+LATEST_IOJS="$(nvm_print_implicit_alias remote iojs)"
+[ "_$LATEST_IOJS" = "_iojs-v0.99" ] || die "remote iojs is not latest: expected iojs-v0.99, got $LATEST_IOJS"
+
 cleanup
 

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/fast/Unit tests/nvm_remote_version

@@ -26,9 +26,18 @@ EXIT_CODE="$(nvm_remote_version iojs-foo >/dev/null 2>&1 ; echo $?)"
 
 
 nvm_ls_remote() {
-  echo "test output"
+  if ! nvm_is_iojs_version "$1"; then
-  echo "more test output"
+    echo "test output"
-  echo "pattern received: _$1_"
+    echo "more test output"
+    echo "pattern received: _$1_"
+  fi
+}
+nvm_ls_remote_iojs() {
+  if [ -z "$1" ] || nvm_is_iojs_version "$1"; then
+    echo "test iojs output"
+    echo "more iojs test output"
+    echo "iojs pattern received: _$1_"
+  fi
 }
 OUTPUT="$(nvm_remote_version foo)"
 EXIT_CODE="$(nvm_remote_version foo >/dev/null 2>&1 ; echo $?)"
@@ -36,17 +45,34 @@ EXIT_CODE="$(nvm_remote_version foo >/dev/null 2>&1 ; echo $?)"
   || die "nvm_remote_version foo did not return last line only of nvm_ls_remote foo; got $OUTPUT"
 [ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version foo did not exit with 0, got $EXIT_CODE"
 
-nvm_ls_remote_iojs() {
-  echo "test iojs output"
-  echo "more iojs test output"
-  echo "iojs pattern received: _$1_"
-
-}
 OUTPUT="$(nvm_remote_version iojs-foo)"
 EXIT_CODE="$(nvm_remote_version iojs-foo >/dev/null 2>&1 ; echo $?)"
 [ "_$OUTPUT" = "_iojs pattern received: _iojs-foo_" ] \
   || die "nvm_remote_version iojs-foo did not return last line only of nvm_ls_remote_iojs foo; got $OUTPUT"
 [ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version iojs-foo did not exit with 0, got $EXIT_CODE"
 
-cleanup
+OUTPUT="$(nvm_remote_version iojs)"
+EXIT_CODE="$(nvm_remote_version iojs >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_iojs pattern received: __" ] \
+  || die "nvm_remote_version iojs did not return last line only of nvm_ls_remote_iojs; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version iojs did not exit with 0, got $EXIT_CODE"
 
+OUTPUT="$(nvm_remote_version stable)"
+EXIT_CODE="$(nvm_remote_version stable >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote stable)" ] \
+  || die "nvm_remote_version stable did not return contents of nvm_ls_remote stable; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version stable did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_version unstable)"
+EXIT_CODE="$(nvm_remote_version unstable >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote unstable)" ] \
+  || die "nvm_remote_version unstable did not return contents of nvm_ls_remote unstable; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version unstable did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_version node)"
+EXIT_CODE="$(nvm_remote_version node >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote node)" ] \
+  || die "nvm_remote_version node did not return contents of nvm_ls_remote node; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version node did not exit with 0, got $EXIT_CODE"
+
+cleanup

test/fast/Unit tests/nvm_validate_implicit_alias

@@ -4,16 +4,18 @@ die () { echo $@ ; exit 1; }
 
 . ../../../nvm.sh
 
-EXPECTED_MSG="Only implicit aliases 'stable' and 'unstable' are supported."
+EXPECTED_MSG="Only implicit aliases 'stable', 'unstable', 'iojs', and 'node' are supported."
 [ "_$(nvm_validate_implicit_alias 2>&1)" = "_$EXPECTED_MSG" ] \
-  || die "nvm_validate_implicit_alias did not require stable|unstable"
+  || die "nvm_validate_implicit_alias did not require stable|unstable|iojs|node"
 [ "_$(nvm_validate_implicit_alias foo 2>&1)" = "_$EXPECTED_MSG" ] \
-  || die "nvm_validate_implicit_alias did not require stable|unstable"
+  || die "nvm_validate_implicit_alias did not require stable|unstable|iojs|node"
 
 EXIT_CODE="$(nvm_validate_implicit_alias >/dev/null 2>&1 ; echo $?)"
 [ "_$EXIT_CODE" = "_1" ] \
-  || die "nvm_validate_implicit_alias without stable|unstable had wrong exit code: expected 1, got $EXIT_CODE"
+  || die "nvm_validate_implicit_alias without stable|unstable|iojs|node had wrong exit code: expected 1, got $EXIT_CODE"
 
 nvm_validate_implicit_alias stable || die "nvm_validate_implicit_alias stable did not exit 0"
 nvm_validate_implicit_alias unstable || die "nvm_validate_implicit_alias unstable did not exit 0"
+nvm_validate_implicit_alias node || die "nvm_validate_implicit_alias node did not exit 0"
+nvm_validate_implicit_alias iojs || die "nvm_validate_implicit_alias iojs did not exit 0"
 

test/install_script/nvm_check_global_modules

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+cleanup () {
+  rm -rf "$npm_config_prefix/lib" >/dev/null 2>&1
+  unset npm_config_prefix
+
+  rm -f npm
+  PATH="$ORIGINAL_PATH"
+
+  unset -f setup cleanup die
+  unset message ORIGINAL_PATH
+}
+die () { echo $@ ; cleanup ; exit 1; }
+
+NVM_ENV=testing . ../../install.sh
+
+setup () {
+  ORIGINAL_PATH="$PATH"
+
+  npm_config_prefix="$(pwd)"
+  export npm_config_prefix
+  mkdir -p "$npm_config_prefix/lib"
+}
+
+
+setup
+
+npm install -g nop >/dev/null || die 'nvm_check_global_modules cannot be tested because `npm` cannot install the `nop` package'
+message=$(nvm_check_global_modules)
+[ ! -z "$message" ] || die "nvm_check_global_modules should have printed a notice when npm had global modules installed"
+
+npm uninstall -g nop >/dev/null
+message=$(nvm_check_global_modules)
+[ -z "$message" ] || die "nvm_check_global_modules should not have printed a notice when npm had no global modules installed"
+
+# Faking an installation of npm
+mkdir -p "$npm_config_prefix/lib/node_modules/npm"
+cat <<'JSON' >"$npm_config_prefix/lib/node_modules/npm/package.json"
+{ "name": "npm", "version": "0.0.1fake" }
+JSON
+
+message=$(nvm_check_global_modules)
+[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm had only itself installed as a global module"
+
+# Faking the absence of npm
+PATH=".:$PATH"
+touch npm
+chmod +x npm
+
+message=$(nvm_check_global_modules)
+[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm was unavailable"
+
+
+cleanup

test/slow/nvm reinstall-packages/should work as expected

@@ -5,17 +5,23 @@ die () { echo "$@" ; exit 1; }
 . ../../../nvm.sh
 
 nvm use 0.10.28
+(cd test-npmlink && npm link)
 
-EXPECTED_PACKAGES="autoprefixer bower david eslint grunt-cli grunth-cli http-server jshint marked node-gyp recursive-blame uglify-js yo"
+EXPECTED_PACKAGES="autoprefixer bower david eslint grunt-cli grunth-cli http-server jshint marked node-gyp npmlist recursive-blame test-npmlink uglify-js yo"
 
 echo "$EXPECTED_PACKAGES" | xargs npm install -g --quiet
 
+get_packages() {
+  npm list -g --depth=0 | \sed -e '1 d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | xargs
+}
+
 nvm use 0.10.29
-ORIGINAL_PACKAGES=$(npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | sort | uniq | xargs)
+ORIGINAL_PACKAGES=$(get_packages)
 
 nvm reinstall-packages 0.10.28
-FINAL_PACKAGES=$(npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | sort | uniq | xargs)
+FINAL_PACKAGES=$(get_packages)
 
 [ "$FINAL_PACKAGES" = "$EXPECTED_PACKAGES" ] || die "final packages ($FINAL_PACKAGES) did not match expected packages ($EXPECTED_PACKAGES)"
 [ "$ORIGINAL_PACKAGES" != "$FINAL_PACKAGES" ] || die "original packages matched final packages ($ORIGINAL_PACKAGES)"
 
+[ $(test-npmlink) = 'ok' ] || die "failed to run test-npmlink"

test/slow/nvm reinstall-packages/test-npmlink/index.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+console.log('ok')

test/slow/nvm reinstall-packages/test-npmlink/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "test-npmlink",
+  "version": "0.0.1",
+  "description": "Stub package for testing npm link",
+  "bin": {
+    "test-npmlink": "index.js"
+  },
+  "author": "hax",
+  "license": "ISC"
+}

test/slow/nvm run/Running "nvm run --harmony --version" should work

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm run 0.10.7 --harmony --version
+[ "_$(nvm run 0.10.7 --harmony --version 2>/dev/null | tail -1)" = "_v0.10.7" ] || die "\`nvm run --harmony --version\` failed to run with the correct version"
+

test/slow/nvm run/Running "nvm run 0.x" should error out sensibly when 0.x is not installed

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "$(nvm run 0.2 --version 2>&1)" = "v0.2 is not installed yet" ] || die "\`nvm run\` with an uninstalled node version failed to error out correctly"
+[ "$(nvm run iojs-0.2 --version 2>&1)" = "iojs-v0.2 is not installed yet" ] || die "\`nvm run\` with an uninstalled iojs version failed to error out correctly"

test/slow/nvm run/Running "nvm run 0.x" should work

@@ -5,5 +5,5 @@ die () { echo $@ ; exit 1; }
 
 . ../../../nvm.sh
 
-[ "$(nvm run 0.10.7 --version | tail -1)" = "v0.10.7" ] || die "`nvm run` failed to run with the correct version"
+[ "$(nvm run 0.10.7 --version | tail -1)" = "v0.10.7" ] || die "\`nvm run\` failed to run with the correct version"
 

test/slow/nvm use/Running "nvm use v1.0.0" uses iojs-v1.0.0 iojs version

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm deactivate 2>&1 >/dev/null || die 'deactivate failed'
+
+nvm use 'v1.0.0' || die 'nvm use v1.0.0 failed'
+OUTPUT="$(nvm current)"
+EXPECTED_OUTPUT="$(nvm_version v1.0.0)"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
+  || die "'nvm use v1.0.0' + 'nvm current' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"