v0.22.2

Fixes #493.

README.markdown

@@ -12,11 +12,11 @@ Note: `nvm` does not support Windows (see [#284](https://github.com/creationix/n
 
 To install you could use the [install script][2] using cURL:
 
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.21.0/install.sh | bash
+    curl https://raw.githubusercontent.com/creationix/nvm/v0.22.2/install.sh | bash
 
 or Wget:
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.21.0/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.22.2/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>
 
@@ -191,7 +191,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.21.0/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.22.2/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
 

install.sh

@@ -4,13 +4,16 @@ set -e
 
 nvm_has() {
   type "$1" > /dev/null 2>&1
-  return $?
 }
 
 if [ -z "$NVM_DIR" ]; then
   NVM_DIR="$HOME/.nvm"
 fi
 
+nvm_latest_version() {
+  echo "v0.22.2"
+}
+
 #
 # Outputs the location to NVM depending on:
 # * The availability of $NVM_SOURCE
@@ -22,19 +25,16 @@ nvm_source() {
   NVM_METHOD="$1"
   if [ -z "$NVM_SOURCE" ]; then
     local NVM_SOURCE
-  else
+    if [ "_$NVM_METHOD" = "_script" ]; then
-    echo "$NVM_SOURCE"
+      NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm.sh"
-    return 0
+    elif [ "_$NVM_METHOD" = "_script-nvm-exec" ]; then
-  fi
+      NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm-exec"
-  if [ "_$NVM_METHOD" = "_script" ]; then
+    elif [ "_$NVM_METHOD" = "_git" ] || [ -z "$NVM_METHOD" ]; then
-    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.21.0/nvm.sh"
+      NVM_SOURCE="https://github.com/creationix/nvm.git"
-  elif [ "_$NVM_METHOD" = "_script-nvm-exec" ]; then
+    else
-    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.21.0/nvm-exec"
+      echo >&2 "Unexpected value \"$NVM_METHOD\" for \$NVM_METHOD"
-  elif [ "_$NVM_METHOD" = "_git" ] || [ -z "$NVM_METHOD" ]; then
+      return 1
-    NVM_SOURCE="https://github.com/creationix/nvm.git"
+    fi
-  else
-    echo >&2 "Unexpected value \"$NVM_METHOD\" for \$NVM_METHOD"
-    return 1
   fi
   echo "$NVM_SOURCE"
   return 0
@@ -45,7 +45,7 @@ nvm_download() {
     curl $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
-    ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
+    ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
                            -e 's/-L //' \
                            -e 's/-I /--server-response /' \
                            -e 's/-s /-q /' \
@@ -59,7 +59,7 @@ install_nvm_from_git() {
   if [ -d "$NVM_DIR/.git" ]; then
     echo "=> nvm is already installed in $NVM_DIR, trying to update"
     printf "\r=> "
-    cd "$NVM_DIR" && (git fetch 2> /dev/null || {
+    cd "$NVM_DIR" && (command git fetch 2> /dev/null || {
       echo >&2 "Failed to update nvm, run 'git fetch' in $NVM_DIR yourself." && exit 1
     })
   else
@@ -67,17 +67,17 @@ install_nvm_from_git() {
     echo "=> Downloading nvm from git to '$NVM_DIR'"
     printf "\r=> "
     mkdir -p "$NVM_DIR"
-    git clone "$(nvm_source "git")" "$NVM_DIR"
+    command git clone "$(nvm_source git)" "$NVM_DIR"
   fi
-  cd "$NVM_DIR" && git checkout --quiet v0.21.0 && git branch --quiet -D master >/dev/null 2>&1
+  cd "$NVM_DIR" && command git checkout --quiet $(nvm_latest_version) && command git branch --quiet -D master >/dev/null 2>&1
   return
 }
 
 install_nvm_as_script() {
   local NVM_SOURCE
-  NVM_SOURCE=$(nvm_source "script")
+  NVM_SOURCE=$(nvm_source script)
   local NVM_EXEC_SOURCE
-  NVM_EXEC_SOURCE=$(nvm_source "script-nvm-exec")
+  NVM_EXEC_SOURCE=$(nvm_source script-nvm-exec)
 
   # Downloading to $NVM_DIR
   mkdir -p "$NVM_DIR"
@@ -178,7 +178,7 @@ 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
+  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
 }
 
 [ "_$NVM_ENV" = "_testing" ] || nvm_do_install

nvm.sh

@@ -35,7 +35,7 @@ nvm_download() {
     curl $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
-    ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
+    ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
                            -e 's/-L //' \
                            -e 's/-I /--server-response /' \
                            -e 's/-s /-q /' \
@@ -140,11 +140,11 @@ nvm_version_greater_than_or_equal_to() {
 }
 
 nvm_version_dir() {
-  local NVM_USE_NEW_DIR
+  local NVM_WHICH_DIR
-  NVM_USE_NEW_DIR="$1"
+  NVM_WHICH_DIR="$1"
-  if [ -z "$NVM_USE_NEW_DIR" ] || [ "$NVM_USE_NEW_DIR" = "new" ]; then
+  if [ -z "$NVM_WHICH_DIR" ] || [ "_$NVM_WHICH_DIR" = "_new" ]; then
-    echo "$NVM_DIR/versions"
+    echo "$NVM_DIR/versions/node"
-  elif [ "$NVM_USE_NEW_DIR" = "old" ]; then
+  elif [ "_$NVM_WHICH_DIR" = "_old" ]; then
     echo "$NVM_DIR"
   else
     echo "unknown version dir" >&2
@@ -152,6 +152,10 @@ nvm_version_dir() {
   fi
 }
 
+nvm_alias_path() {
+  echo "$(nvm_version_dir old)/alias"
+}
+
 nvm_version_path() {
   local VERSION
   VERSION="$1"
@@ -201,18 +205,18 @@ nvm_remote_version() {
 }
 
 nvm_normalize_version() {
-  echo "$1" | sed -e 's/^v//' | \awk -F. '{ printf("%d%06d%06d\n", $1,$2,$3); }'
+  echo "$1" | command sed -e 's/^v//' | command awk -F. '{ printf("%d%06d%06d\n", $1,$2,$3); }'
 }
 
 nvm_ensure_version_prefix() {
-  echo "$1" | sed -e 's/^\([0-9]\)/v\1/g'
+  echo "$1" | command sed -e 's/^\([0-9]\)/v\1/g'
 }
 
 nvm_format_version() {
   local VERSION
   VERSION="$(nvm_ensure_version_prefix "$1")"
   if [ "_$(nvm_num_version_groups "$VERSION")" != "_3" ]; then
-    VERSION="$(echo "$VERSION" | sed -e 's/\.*$/.0/')"
+    VERSION="$(echo "$VERSION" | command sed -e 's/\.*$/.0/')"
     nvm_format_version "$VERSION"
   else
     echo "$VERSION"
@@ -227,14 +231,14 @@ nvm_num_version_groups() {
     return
   fi
   local NVM_NUM_DOTS
-  NVM_NUM_DOTS=$(echo "$VERSION" | sed -e 's/^v//' | sed -e 's/\.$//' | sed -e 's/[^\.]//g')
+  NVM_NUM_DOTS=$(echo "$VERSION" | command sed -e 's/^v//' | command sed -e 's/\.$//' | command sed -e 's/[^\.]//g')
   local NVM_NUM_GROUPS
   NVM_NUM_GROUPS=".$NVM_NUM_DOTS"
   echo "${#NVM_NUM_GROUPS}"
 }
 
 nvm_strip_path() {
-  echo "$1" | sed -e "s#$NVM_DIR/[^/]*$2[^:]*:##g" -e "s#:$NVM_DIR/[^/]*$2[^:]*##g" -e "s#$NVM_DIR/[^/]*$2[^:]*##g"
+  echo "$1" | command sed -e "s#$NVM_DIR/[^/]*$2[^:]*:##g" -e "s#:$NVM_DIR/[^/]*$2[^:]*##g" -e "s#$NVM_DIR/[^/]*$2[^:]*##g"
 }
 
 nvm_prepend_path() {
@@ -261,7 +265,7 @@ nvm_alias() {
   fi
 
   local NVM_ALIAS_PATH
-  NVM_ALIAS_PATH="$NVM_DIR/alias/$ALIAS"
+  NVM_ALIAS_PATH="$(nvm_alias_path)/$ALIAS"
   if [ ! -f "$NVM_ALIAS_PATH" ]; then
     echo >&2 'Alias does not exist.'
     return 2
@@ -272,12 +276,12 @@ nvm_alias() {
 
 nvm_ls_current() {
   local NVM_LS_CURRENT_NODE_PATH
-  NVM_LS_CURRENT_NODE_PATH="$(which node 2> /dev/null)"
+  NVM_LS_CURRENT_NODE_PATH="$(command which node 2> /dev/null)"
   if [ $? -ne 0 ]; then
     echo 'none'
   elif nvm_tree_contains_path "$NVM_DIR" "$NVM_LS_CURRENT_NODE_PATH"; then
     local VERSION
-    VERSION=`node -v 2>/dev/null`
+    VERSION="$(node -v 2>/dev/null)"
     if [ "$VERSION" = "v0.6.21-pre" ]; then
       echo "v0.6.21"
     else
@@ -310,7 +314,7 @@ nvm_resolve_alias() {
     fi
 
     if [ -n "$ALIAS_TEMP" ] \
-      && printf "$SEEN_ALIASES" | \grep -e "^$ALIAS_TEMP$" > /dev/null; then
+      && printf "$SEEN_ALIASES" | command grep -e "^$ALIAS_TEMP$" > /dev/null; then
       ALIAS="∞"
       break
     fi
@@ -343,7 +347,7 @@ nvm_resolve_alias() {
 
 nvm_ls() {
   local PATTERN
-  PATTERN=$1
+  PATTERN="$1"
   local VERSIONS
   VERSIONS=''
   if [ "$PATTERN" = 'current' ]; then
@@ -366,23 +370,47 @@ 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="$(echo "$PATTERN" | sed -e 's/\.*$//g')."
+        PATTERN="$(echo "$PATTERN" | command sed -e 's/\.*$//g')."
       fi
     fi
-    if [ -d "$(nvm_version_dir new)" ]; then
+
-      VERSIONS=`find "$(nvm_version_dir new)/" "$(nvm_version_dir old)/" -maxdepth 1 -type d -name "$PATTERN*" -exec basename '{}' ';' \
+    local ZHS_HAS_SHWORDSPLIT_UNSET
-        | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n | \grep -v '^ *\.' | \grep -e '^v' | \grep -v -e '^versions$'`
+    ZHS_HAS_SHWORDSPLIT_UNSET=1
-    else
+    if nvm_has "setopt"; then
-      VERSIONS=`find "$(nvm_version_dir old)/" -maxdepth 1 -type d -name "$PATTERN*" -exec basename '{}' ';' \
+      ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
-        | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n | \grep -v '^ *\.' | \grep -e '^v'`
+      setopt shwordsplit
+    fi
+
+    local NVM_DIRS_TO_TEST_AND_SEARCH
+    local NVM_DIRS_TO_SEARCH
+    NVM_DIRS_TO_TEST_AND_SEARCH="$(nvm_version_dir old) $(nvm_version_dir new)"
+    for NVM_VERSION_DIR in $NVM_DIRS_TO_TEST_AND_SEARCH; do
+      if [ -d "$NVM_VERSION_DIR" ]; then
+        NVM_DIRS_TO_SEARCH="$NVM_VERSION_DIR $NVM_DIRS_TO_SEARCH"
+      fi
+    done
+
+    if [ -z "$PATTERN" ]; then
+      PATTERN='v'
+    fi
+    VERSIONS="$(command find $NVM_DIRS_TO_SEARCH -maxdepth 1 -type d -name "$PATTERN*" \
+      | command sed "s#^$NVM_DIR/##" \
+      | command grep -v -e '^versions$' \
+      | sed -e 's/^v/node-v/' \
+      | command sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n \
+      | command sort -s -t- -k1.1,1.1 \
+      | command sed 's/^node-//')"
+
+    if [ $ZHS_HAS_SHWORDSPLIT_UNSET -eq 1 ] && nvm_has "unsetopt"; then
+      unsetopt shwordsplit
     fi
   fi
 
   if nvm_has_system_node; then
-    if [ -z "$PATTERN" ]; then
+    if [ -z "$PATTERN" ] || [ "_$PATTERN" = "_v" ]; then
-      VERSIONS="$VERSIONS$(printf '\n%s' 'system')"
+      VERSIONS="$VERSIONS$(command printf '\n%s' 'system')"
     elif [ "$PATTERN" = 'system' ]; then
-      VERSIONS="$(printf '%s' 'system')"
+      VERSIONS="$(command printf '%s' 'system')"
     fi
   fi
 
@@ -392,7 +420,6 @@ nvm_ls() {
   fi
 
   echo "$VERSIONS"
-  return
 }
 
 nvm_ls_remote() {
@@ -410,7 +437,7 @@ nvm_ls_remote() {
   fi
   VERSIONS=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/ -o - \
               | \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' \
-              | \grep -w "${PATTERN}" \
+              | command grep -w "${PATTERN}" \
               | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n`
   if [ -z "$VERSIONS" ]; then
     echo "N/A"
@@ -422,11 +449,11 @@ nvm_ls_remote() {
 
 nvm_checksum() {
   if nvm_has "sha1sum"; then
-    checksum="$(sha1sum "$1" | \awk '{print $1}')"
+    checksum="$(sha1sum "$1" | command awk '{print $1}')"
   elif nvm_has "sha1"; then
     checksum="$(sha1 -q "$1")"
   else
-    checksum="$(shasum "$1" | \awk '{print $1}')"
+    checksum="$(shasum "$1" | command awk '{print $1}')"
   fi
 
   if [ "_$checksum" = "_$2" ]; then
@@ -478,9 +505,9 @@ nvm_print_implicit_alias() {
 
   local LAST_TWO
   if [ "_$1" = "_local" ]; then
-    LAST_TWO=$(nvm_ls | \grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
+    LAST_TWO=$(nvm_ls | command grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
   else
-    LAST_TWO=$(nvm_ls_remote | \grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
+    LAST_TWO=$(nvm_ls_remote | command grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
   fi
   local MINOR
   local STABLE
@@ -490,7 +517,7 @@ nvm_print_implicit_alias() {
   local ZHS_HAS_SHWORDSPLIT_UNSET
   ZHS_HAS_SHWORDSPLIT_UNSET=1
   if nvm_has "setopt"; then
-    ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | \grep shwordsplit > /dev/null ; echo $?)
+    ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
     setopt shwordsplit
   fi
   for MINOR in $LAST_TWO; do
@@ -512,6 +539,152 @@ nvm_print_implicit_alias() {
   fi
 }
 
+nvm_get_os() {
+  local NVM_UNAME
+  NVM_UNAME="$(uname -a)"
+  local NVM_OS
+  case "$NVM_UNAME" in
+    Linux\ *) NVM_OS=linux ;;
+    Darwin\ *) NVM_OS=darwin ;;
+    SunOS\ *) NVM_OS=sunos ;;
+    FreeBSD\ *) NVM_OS=freebsd ;;
+  esac
+  echo "$NVM_OS"
+}
+
+nvm_get_arch() {
+  local NVM_UNAME
+  NVM_UNAME="$(uname -a)"
+  local NVM_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_install_node_binary() {
+  local VERSION
+  VERSION="$1"
+  local REINSTALL_PACKAGES_FROM
+  REINSTALL_PACKAGES_FROM="$2"
+
+  local VERSION_PATH
+  VERSION_PATH="$(nvm_version_path "$VERSION")"
+  local NVM_OS
+  NVM_OS="$(nvm_get_os)"
+  local t
+  local url
+  local sum
+
+  if [ -n "$NVM_OS" ]; then
+    if nvm_binary_available "$VERSION"; then
+      t="$VERSION-$NVM_OS-$(nvm_get_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
+      tmpdir="$NVM_DIR/bin/node-${t}"
+      local tmptarball
+      tmptarball="$tmpdir/node-${t}.tar.gz"
+      if (
+        command mkdir -p "$tmpdir" && \
+        nvm_download -L -C - --progress-bar $url -o "$tmptarball" && \
+        nvm_checksum "$tmptarball" $sum && \
+        command tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
+        command rm -f "$tmptarball" && \
+        command mv "$tmpdir" "$VERSION_PATH"
+        )
+      then
+        return 0
+      else
+        echo "Binary download failed, trying source." >&2
+        command rm -rf "$tmptarball" "$tmpdir"
+        return 1
+      fi
+    fi
+  fi
+  return 2
+}
+
+nvm_install_node_source() {
+  local VERSION
+  VERSION="$1"
+  local REINSTALL_PACKAGES_FROM
+  REINSTALL_PACKAGES_FROM="$2"
+  local ADDITIONAL_PARAMETERS
+  ADDITIONAL_PARAMETERS="$3"
+
+  if [ -n "$ADDITIONAL_PARAMETERS" ]; then
+    echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"
+  fi
+
+  local VERSION_PATH
+  VERSION_PATH="$(nvm_version_path "$VERSION")"
+  local NVM_OS
+  NVM_OS="$(nvm_get_os)"
+
+  local tarball
+  tarball=''
+  local sum
+  sum=''
+  local make
+  make='make'
+  if [ "_$NVM_OS" = "_freebsd" ]; then
+    make='gmake'
+    MAKE_CXX="CXX=c++"
+  fi
+  local tmpdir
+  tmpdir="$NVM_DIR/src"
+  local tmptarball
+  tmptarball="$tmpdir/node-$VERSION.tar.gz"
+
+  if [ "`nvm_download -L -s -I "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" -o - 2>&1 | command grep '200 OK'`" != '' ]; then
+    tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz"
+    sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | command grep "node-$VERSION.tar.gz" | command awk '{print $1}'`
+  elif [ "`nvm_download -L -s -I "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" -o - | command grep '200 OK'`" != '' ]; then
+    tarball="$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz"
+  fi
+
+  if (
+    [ -n "$tarball" ] && \
+    command mkdir -p "$tmpdir" && \
+    nvm_download -L --progress-bar $tarball -o "$tmptarball" && \
+    nvm_checksum "$tmptarball" $sum && \
+    command tar -xzf "$tmptarball" -C "$tmpdir" && \
+    cd "$tmpdir/node-$VERSION" && \
+    ./configure --prefix="$VERSION_PATH" $ADDITIONAL_PARAMETERS && \
+    $make $MAKE_CXX && \
+    command rm -f "$VERSION_PATH" 2>/dev/null && \
+    $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
+        echo "npm requires node v0.2.3 or higher" >&2
+      elif nvm_version_greater_than_or_equal_to "$VERSION" 0.2.0; then
+        if nvm_version_greater 0.2.3 "$VERSION"; then
+          echo "npm requires node v0.2.3 or higher" >&2
+        else
+          nvm_download -L https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh
+        fi
+      else
+        nvm_download -L https://npmjs.org/install.sh -o - | clean=yes sh
+      fi
+    fi
+  else
+    echo "nvm: install $VERSION failed!" >&2
+    return 1
+  fi
+
+  return $?
+}
+
 nvm() {
   if [ $# -lt 1 ]; then
     nvm help
@@ -519,24 +692,10 @@ nvm() {
   fi
 
   # Try to figure out the os and arch for binary fetching
-  local uname
-  uname="$(uname -a)"
   local os
   local arch
-  arch="$(uname -m)"
   local GREP_OPTIONS
   GREP_OPTIONS=''
-  case "$uname" in
-    Linux\ *) os=linux ;;
-    Darwin\ *) os=darwin ;;
-    SunOS\ *) os=sunos ;;
-    FreeBSD\ *) os=freebsd ;;
-  esac
-  case "$uname" in
-    *x86_64*) arch=x64 ;;
-    *i*86*) arch=x86 ;;
-    *armv6l*) arch=arm-pi ;;
-  esac
 
   # initialize local variables
   local VERSION
@@ -580,16 +739,12 @@ nvm() {
     ;;
 
     "install" | "i" )
-      # initialize local variables
-      local binavail
-      local t
-      local url
-      local sum
-      local tarball
       local nobinary
       local version_not_provided
       version_not_provided=0
       local provided_version
+      local NVM_OS
+      NVM_OS="$(nvm_get_os)"
 
       if ! nvm_has "curl" && ! nvm_has "wget"; then
         echo 'nvm needs curl or wget to proceed.' >&2;
@@ -608,12 +763,12 @@ nvm() {
       shift
 
       nobinary=0
-      if [ "$1" = "-s" ]; then
+      if [ "_$1" = "_-s" ]; then
         nobinary=1
         shift
       fi
 
-      if [ "$os" = "freebsd" ]; then
+      if [ "_$NVM_OS" = "_freebsd" ]; then
         nobinary=1
       fi
 
@@ -635,11 +790,11 @@ nvm() {
 
       while [ $# -ne 0 ]
       do
-        if [ "_$(echo "$1" | cut -c 1-26)" = "_--reinstall-packages-from=" ]; then
+        if [ "_$(echo "$1" | command cut -c 1-26)" = "_--reinstall-packages-from=" ]; then
-          PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | cut -c 27-)"
+          PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 27-)"
           REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")"
-        elif [ "_$(echo "$1" | cut -c 1-21)" = "_--copy-packages-from=" ]; then
+        elif [ "_$(echo "$1" | command cut -c 1-21)" = "_--copy-packages-from=" ]; then
-          PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | cut -c 22-)"
+          PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 22-)"
           REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")"
         else
           ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
@@ -655,7 +810,9 @@ nvm() {
         return 5
       fi
 
-      if [ -d "$(nvm_version_path "$VERSION")" ]; then
+      local VERSION_PATH
+      VERSION_PATH="$(nvm_version_path "$VERSION")"
+      if [ -d "$VERSION_PATH" ]; then
         echo "$VERSION is already installed." >&2
         if nvm use "$VERSION" && [ ! -z "$REINSTALL_PACKAGES_FROM" ] && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
           nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
@@ -663,136 +820,60 @@ nvm() {
         return $?
       fi
 
-      if [ "$VERSION" = "N/A" ]; then
+      if [ "_$VERSION" = "_N/A" ]; then
         echo "Version '$provided_version' not found - try \`nvm ls-remote\` to browse available versions." >&2
         return 3
       fi
 
-      # skip binary install if no binary option specified.
+      # skip binary install if "nobinary" option specified.
-      if [ $nobinary -ne 1 ]; then
+      if [ $nobinary -ne 1 ] && nvm_install_node_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
-        # shortcut - try the binary if possible.
+        if nvm use "$VERSION" \
-        if [ -n "$os" ]; then
+          && [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
-          if nvm_binary_available "$VERSION"; then
+          && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
-            t="$VERSION-$os-$arch"
-            url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz"
-            sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-${t}.tar.gz | \awk '{print $1}'`
-            local tmpdir
-            tmpdir="$NVM_DIR/bin/node-${t}"
-            local tmptarball
-            tmptarball="$tmpdir/node-${t}.tar.gz"
-            if (
-              mkdir -p "$tmpdir" && \
-              nvm_download -L -C - --progress-bar $url -o "$tmptarball" && \
-              nvm_checksum "$tmptarball" $sum && \
-              tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
-              rm -f "$tmptarball" && \
-              mv "$tmpdir" "$(nvm_version_path "$VERSION")"
-              )
-            then
-              if nvm use "$VERSION" && [ ! -z "$REINSTALL_PACKAGES_FROM" ] && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
-                nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
-              fi
-              return $?
-            else
-              echo "Binary download failed, trying source." >&2
-              rm -rf "$tmptarball" "$tmpdir"
-            fi
-          fi
-        fi
-      fi
-
-      if [ -n "$ADDITIONAL_PARAMETERS" ]; then
-        echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"
-      fi
-
-      tarball=''
-      sum=''
-      make='make'
-      if [ "$os" = "freebsd" ]; then
-        make='gmake'
-        MAKE_CXX="CXX=c++"
-      fi
-      local tmpdir
-      tmpdir="$NVM_DIR/src"
-      local tmptarball
-      tmptarball="$tmpdir/node-$VERSION.tar.gz"
-      if [ "`nvm_download -L -s -I "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" -o - 2>&1 | \grep '200 OK'`" != '' ]; then
-        tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz"
-        sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-$VERSION.tar.gz | \awk '{print $1}'`
-      elif [ "`nvm_download -L -s -I "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" -o - | \grep '200 OK'`" != '' ]; then
-        tarball="$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz"
-      fi
-      if (
-        [ -n "$tarball" ] && \
-        mkdir -p "$tmpdir" && \
-        nvm_download -L --progress-bar $tarball -o "$tmptarball" && \
-        nvm_checksum "$tmptarball" $sum && \
-        tar -xzf "$tmptarball" -C "$tmpdir" && \
-        cd "$tmpdir/node-$VERSION" && \
-        ./configure --prefix="$(nvm_version_path "$VERSION")" $ADDITIONAL_PARAMETERS && \
-        $make $MAKE_CXX && \
-        rm -f "$(nvm_version_path "$VERSION")" 2>/dev/null && \
-        $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
+        return $?
-          echo "Installing npm..."
-          if nvm_version_greater 0.2.0 "$VERSION"; then
-            echo "npm requires node v0.2.3 or higher" >&2
-          elif nvm_version_greater_than_or_equal_to "$VERSION" 0.2.0; then
-            if nvm_version_greater 0.2.3 "$VERSION"; then
-              echo "npm requires node v0.2.3 or higher" >&2
-            else
-              nvm_download -L https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh
-            fi
-          else
-            nvm_download -L https://npmjs.org/install.sh -o - | clean=yes sh
-          fi
-        fi
-      else
-        echo "nvm: install $VERSION failed!" >&2
-        return 1
       fi
 
-      return $?
+      nvm_install_node_source "$VERSION" "$REINSTALL_PACKAGES_FROM" "$ADDITIONAL_PARAMETERS"
     ;;
     "uninstall" )
       [ $# -ne 2 ] && nvm help && return
-      PATTERN=`nvm_ensure_version_prefix $2`
+      PATTERN="$(nvm_ensure_version_prefix "$2")"
-      if [ "$PATTERN" = `nvm_version` ]; then
+      if [ "_$PATTERN" = "_$(nvm_version)" ]; then
         echo "nvm: Cannot uninstall currently-active node version, $PATTERN." >&2
         return 1
       fi
-      VERSION=`nvm_version $PATTERN`
+      local VERSION
-      if [ ! -d "$(nvm_version_path "$VERSION")" ]; then
+      VERSION="$(nvm_version "$PATTERN")"
+      local VERSION_PATH
+      VERSION_PATH="$(nvm_version_path "$VERSION")"
+      if [ ! -d "$VERSION_PATH" ]; then
         echo "$VERSION version is not installed..." >&2
         return;
       fi
 
-      t="$VERSION-$os-$arch"
+      t="$VERSION-$(nvm_get_os)-$(nvm_get_arch)"
 
       # Delete all files related to target version.
-      rm -rf "$NVM_DIR/src/node-$VERSION" \
+      command rm -rf "$NVM_DIR/src/node-$VERSION" \
              "$NVM_DIR/src/node-$VERSION.tar.gz" \
              "$NVM_DIR/bin/node-${t}" \
              "$NVM_DIR/bin/node-${t}.tar.gz" \
-             "$(nvm_version_path "$VERSION")" 2>/dev/null
+             "$VERSION_PATH" 2>/dev/null
       echo "Uninstalled node $VERSION"
 
       # Rm any aliases that point to uninstalled version.
-      for ALIAS in `\grep -l $VERSION $NVM_DIR/alias/* 2>/dev/null`
+      for ALIAS in `command grep -l $VERSION "$(nvm_alias_path)/*" 2>/dev/null`
       do
-        nvm unalias `basename $ALIAS`
+        nvm unalias "$(command basename "$ALIAS")"
       done
 
     ;;
     "deactivate" )
       local NEWPATH
       NEWPATH="$(nvm_strip_path "$PATH" "/bin")"
-      if [ "$PATH" = "$NEWPATH" ]; then
+      if [ "_$PATH" = "_$NEWPATH" ]; then
         echo "Could not find $NVM_DIR/*/bin in \$PATH" >&2
       else
         export PATH="$NEWPATH"
@@ -801,7 +882,7 @@ nvm() {
       fi
 
       NEWPATH="$(nvm_strip_path "$MANPATH" "/share/man")"
-      if [ "$MANPATH" = "$NEWPATH" ]; then
+      if [ "_$MANPATH" = "_$NEWPATH" ]; then
         echo "Could not find $NVM_DIR/*/share/man in \$MANPATH" >&2
       else
         export MANPATH="$NEWPATH"
@@ -809,7 +890,7 @@ nvm() {
       fi
 
       NEWPATH="$(nvm_strip_path "$NODE_PATH" "/lib/node_modules")"
-      if [ "$NODE_PATH" != "$NEWPATH" ]; then
+      if [ "_$NODE_PATH" != "_$NEWPATH" ]; then
         export NODE_PATH="$NEWPATH"
         echo "$NVM_DIR/*/lib/node_modules removed from \$NODE_PATH"
       fi
@@ -822,7 +903,7 @@ nvm() {
       if [ $# -eq 1 ]; then
         nvm_rc_version
         if [ -n "$NVM_RC_VERSION" ]; then
-          VERSION=`nvm_version $NVM_RC_VERSION`
+          VERSION="$(nvm_version "$NVM_RC_VERSION")"
         fi
       elif [ "_$2" != '_system' ]; then
         VERSION="$(nvm_version "$2")"
@@ -854,17 +935,17 @@ nvm() {
         return 1
       fi
       # Strip other version from PATH
-      PATH=`nvm_strip_path "$PATH" "/bin"`
+      PATH="$(nvm_strip_path "$PATH" "/bin")"
       # Prepend current version
-      PATH=`nvm_prepend_path "$PATH" "$NVM_VERSION_DIR/bin"`
+      PATH="$(nvm_prepend_path "$PATH" "$NVM_VERSION_DIR/bin")"
       if nvm_has manpath; then
         if [ -z "$MANPATH" ]; then
           MANPATH=$(manpath)
         fi
         # Strip other version from MANPATH
-        MANPATH=`nvm_strip_path "$MANPATH" "/share/man"`
+        MANPATH="$(nvm_strip_path "$MANPATH" "/share/man")"
         # Prepend current version
-        MANPATH=`nvm_prepend_path "$MANPATH" "$NVM_VERSION_DIR/share/man"`
+        MANPATH="$(nvm_prepend_path "$MANPATH" "$NVM_VERSION_DIR/share/man")"
         export MANPATH
       fi
       export PATH
@@ -872,7 +953,7 @@ nvm() {
       export NVM_PATH="$NVM_VERSION_DIR/lib/node"
       export NVM_BIN="$NVM_VERSION_DIR/bin"
       if [ "$NVM_SYMLINK_CURRENT" = true ]; then
-        rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current"
+        command rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current"
       fi
       echo "Now using node $VERSION"
     ;;
@@ -885,7 +966,7 @@ nvm() {
       if [ $# -lt 1 ]; then
         nvm_rc_version && has_checked_nvmrc=1
         if [ -n "$NVM_RC_VERSION" ]; then
-          VERSION=`nvm_version $NVM_RC_VERSION`
+          VERSION="$(nvm_version "$NVM_RC_VERSION")"
         else
           VERSION='N/A'
         fi
@@ -897,13 +978,13 @@ nvm() {
 
       provided_version=$1
       if [ -n "$provided_version" ]; then
-        VERSION=`nvm_version $provided_version`
+        VERSION="$(nvm_version "$provided_version")"
         if [ "_$VERSION" = "_N/A" ]; then
           provided_version=''
           if [ $has_checked_nvmrc -ne 1 ]; then
             nvm_rc_version && has_checked_nvmrc=1
           fi
-          VERSION=`nvm_version $NVM_RC_VERSION`
+          VERSION="$(nvm_version "$NVM_RC_VERSION")"
         else
           shift
         fi
@@ -925,8 +1006,8 @@ nvm() {
       local provided_version
       provided_version="$1"
       if [ -n "$provided_version" ]; then
-        VERSION=`nvm_version $provided_version`
+        VERSION="$(nvm_version "$provided_version")"
-        if [ $VERSION = "N/A" ]; then
+        if [ "_$VERSION" = "_N/A" ]; then
           provided_version=''
           nvm_rc_version
           VERSION="$(nvm_version "$NVM_RC_VERSION")"
@@ -936,13 +1017,13 @@ nvm() {
       fi
 
       local NVM_VERSION_DIR
-      NVM_VERSION_DIR=$(nvm_version_path "$VERSION")
+      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 "Running node $VERSION"
-      NODE_VERSION=$VERSION $NVM_DIR/nvm-exec "$@"
+      NODE_VERSION="$VERSION" $NVM_DIR/nvm-exec "$@"
     ;;
     "ls" | "list" )
       local NVM_LS_OUTPUT
@@ -969,7 +1050,7 @@ nvm() {
       if [ $# -eq 1 ]; then
         nvm_rc_version
         if [ -n "$NVM_RC_VERSION" ]; then
-          VERSION=$(nvm_version $NVM_RC_VERSION)
+          VERSION=$(nvm_version "$NVM_RC_VERSION")
         fi
       elif [ "_$2" != '_system' ]; then
         VERSION="$(nvm_version "$2")"
@@ -984,7 +1065,7 @@ nvm() {
       if [ "_$VERSION" = '_system' ]; then
         if nvm_has_system_node >/dev/null 2>&1; then
           local NVM_BIN
-          NVM_BIN="$(nvm use system >/dev/null 2>&1 && which node)"
+          NVM_BIN="$(nvm use system >/dev/null 2>&1 && command which node)"
           if [ -n "$NVM_BIN" ]; then
             echo "$NVM_BIN"
             return
@@ -1009,11 +1090,13 @@ nvm() {
       echo "$NVM_VERSION_DIR/bin/node"
     ;;
     "alias" )
-      mkdir -p "$NVM_DIR/alias"
+      local NVM_ALIAS_DIR
+      NVM_ALIAS_DIR="$(nvm_alias_path)"
+      command mkdir -p "$NVM_ALIAS_DIR"
       if [ $# -le 2 ]; then
         local DEST
-        for ALIAS_PATH in "$NVM_DIR"/alias/"$2"*; do
+        for ALIAS_PATH in "$NVM_ALIAS_DIR"/"$2"*; do
-          ALIAS="$(basename "$ALIAS_PATH")"
+          ALIAS="$(command basename "$ALIAS_PATH")"
           DEST="$(nvm_alias "$ALIAS" 2> /dev/null)"
           if [ -n "$DEST" ]; then
             VERSION="$(nvm_version "$DEST")"
@@ -1026,7 +1109,7 @@ nvm() {
         done
 
         for ALIAS in "stable" "unstable"; do
-          if [ ! -f "$NVM_DIR/alias/$ALIAS" ]; then
+          if [ ! -f "$NVM_ALIAS_DIR/$ALIAS" ]; then
             if [ $# -lt 2 ] || [ "~$ALIAS" = "~$2" ]; then
               DEST="$(nvm_print_implicit_alias local "$ALIAS")"
               if [ "_$DEST" != "_" ]; then
@@ -1039,7 +1122,7 @@ nvm() {
         return
       fi
       if [ -z "$3" ]; then
-        rm -f "$NVM_DIR/alias/$2"
+        command rm -f "$NVM_ALIAS_DIR/$2"
         echo "$2 -> *poof*"
         return
       fi
@@ -1047,7 +1130,7 @@ nvm() {
       if [ $? -ne 0 ]; then
         echo "! WARNING: Version '$3' does not exist." >&2
       fi
-      echo $3 > "$NVM_DIR/alias/$2"
+      echo "$3" > "$NVM_ALIAS_DIR/$2"
       if [ ! "_$3" = "_$VERSION" ]; then
         echo "$2 -> $3 (-> $VERSION)"
       else
@@ -1055,10 +1138,12 @@ nvm() {
       fi
     ;;
     "unalias" )
-      mkdir -p $NVM_DIR/alias
+      local NVM_ALIAS_DIR
+      NVM_ALIAS_DIR="$(nvm_alias_path)"
+      command mkdir -p "$NVM_ALIAS_DIR"
       [ $# -ne 2 ] && nvm help && return 127
-      [ ! -f "$NVM_DIR/alias/$2" ] && echo "Alias $2 doesn't exist!" >&2 && return
+      [ ! -f "$NVM_ALIAS_DIR/$2" ] && echo "Alias $2 doesn't exist!" >&2 && return
-      rm -f $NVM_DIR/alias/$2
+      command rm -f "$NVM_ALIAS_DIR/$2"
       echo "Deleted alias $2"
     ;;
     "reinstall-packages" | "copy-packages" )
@@ -1070,39 +1155,39 @@ nvm() {
       local PROVIDED_VERSION
       PROVIDED_VERSION="$2"
 
-      if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version $PROVIDED_VERSION)" = "$(nvm_ls_current)" ]; then
+      if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version "$PROVIDED_VERSION")" = "$(nvm_ls_current)" ]; then
         echo 'Can not reinstall packages from the current version of node.' >&2
         return 2
       fi
 
       local INSTALLS
-      if [ "$PROVIDED_VERSION" = "system" ]; then
+      if [ "_$PROVIDED_VERSION" = "_system" ]; then
         if ! nvm_has_system_node; then
           echo 'No system version of node detected.' >&2
           return 3
         fi
-        INSTALLS=$(nvm deactivate > /dev/null && npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | xargs)
+        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)
       else
         local VERSION
         VERSION="$(nvm_version "$PROVIDED_VERSION")"
-        INSTALLS=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | xargs)
+        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)
       fi
 
       echo "Copying global packages from $VERSION..."
-      echo "$INSTALLS" | xargs npm install -g --quiet
+      echo "$INSTALLS" | command xargs npm install -g --quiet
     ;;
     "clear-cache" )
-      rm -f $NVM_DIR/v* "$(nvm_version_dir)" 2>/dev/null
+      command rm -f $NVM_DIR/v* "$(nvm_version_dir)" 2>/dev/null
       echo "Cache cleared."
     ;;
     "version" )
       nvm_version $2
     ;;
     "--version" )
-      echo "0.21.0"
+      echo "0.22.2"
     ;;
     "unload" )
-      unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version nvm_version_greater nvm_version_greater_than_or_equal_to > /dev/null 2>&1
+      unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version nvm_version_greater nvm_version_greater_than_or_equal_to nvm_supports_source_options > /dev/null 2>&1
       unset RC_VERSION NVM_NODEJS_ORG_MIRROR NVM_DIR NVM_CD_FLAGS > /dev/null 2>&1
     ;;
     * )
@@ -1111,7 +1196,18 @@ nvm() {
   esac
 }
 
-if nvm ls default >/dev/null; then
+nvm_supports_source_options() {
+  [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
+}
+
+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
   nvm use default >/dev/null
 elif nvm_rc_version >/dev/null 2>&1; then
   nvm use >/dev/null

package.json

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

test/fast/Listing paths/Running "nvm which 0.0.2" should display only version 0.0.2.

@@ -2,7 +2,7 @@
 
 mkdir -p ../../../v0.0.2
 mkdir -p ../../../v0.0.20
-mkdir -p ../../../versions/v0.12.0
+mkdir -p ../../../versions/node/v0.12.0
 
 . ../../../nvm.sh
 

test/fast/Listing versions/Running "nvm ls" should filter out "versions"

@@ -2,7 +2,7 @@
 
 mkdir ../../../v0.1.3
 mkdir ../../../v0.2.3
-mkdir ../../../versions
+mkdir -p ../../../versions/node
 
 . ../../../nvm.sh
 

test/fast/Listing versions/Running "nvm ls" should list versions in the "versions" directory

@@ -2,7 +2,7 @@
 
 die () { echo $@ ; exit 1; }
 
-mkdir -p ../../../versions/v0.12.1
+mkdir -p ../../../versions/node/v0.12.1
 mkdir ../../../v0.1.3
 
 . ../../../nvm.sh

test/fast/Unit tests/nvm_alias_path

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "_$(nvm_alias_path)" = "_$NVM_DIR/alias" ] || die "nvm_alias_path did not requrn correct location"
+

test/fast/Unit tests/nvm_ensure_version_prefix

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "_$(nvm_ensure_version_prefix 1)" = "_v1" ] || die '"nvm_ensure_version_prefix 1" did not return "v1"'
+[ "_$(nvm_ensure_version_prefix v1)" = "_v1" ] || die '"nvm_ensure_version_prefix v1" did not return "v1"'
+[ "_$(nvm_ensure_version_prefix foo)" = "_foo" ] || die '"nvm_ensure_version_prefix foo" did not return "foo"'

test/fast/Unit tests/nvm_ls_current

@@ -1,6 +1,10 @@
 #!/bin/sh
 
-die () { echo $@ ; exit 1; }
+TEST_PWD=$(pwd)
+TEST_DIR="$TEST_PWD/nvm_ls_current_tmp"
+
+cleanup() { rm -rf "$TEST_DIR"; unset -f return_zero; unalias node; }
+die () { echo $@ ; cleanup ; exit 1; }
 
 . ../../../nvm.sh
 
@@ -8,12 +12,10 @@ return_zero () { return 0; }
 
 [ "$(nvm deactivate > /dev/null 2>&1 ; nvm_ls_current)" = "system" ] || die 'when deactivated, did not return "system"'
 
-TEST_PWD=$(pwd)
-TEST_DIR="$TEST_PWD/nvm_ls_current_tmp"
 rm -rf "$TEST_DIR"
 mkdir "$TEST_DIR"
-ln -s "$(which which)" "$TEST_DIR/which"
+ln -s "$(command which which)" "$TEST_DIR/which"
-ln -s "$(which dirname)" "$TEST_DIR/dirname"
+ln -s "$(command which dirname)" "$TEST_DIR/dirname"
 
 [ "$(PATH="$TEST_DIR" nvm_ls_current)" = "none" ] || die 'when node not installed, nvm_ls_current did not return "none"'
 [ "@$(PATH="$TEST_DIR" nvm_ls_current 2> /dev/stdout 1> /dev/null)@" = "@@" ] || die 'when node not installed, nvm_ls_current returned error output'
@@ -24,5 +26,7 @@ chmod a+x "$TEST_DIR/node"
 
 [ "$(alias nvm_tree_contains_path='return_zero' && PATH="$TEST_DIR" nvm_ls_current)" = "VERSION FOO!" ] || die 'when activated, did not return nvm node version'
 
-rm -rf "$TEST_DIR"
+alias node='node --harmony'
+[ "$(alias nvm_tree_contains_path='return_zero' && PATH="$TEST_DIR" nvm_ls_current)" = "VERSION FOO!" ] || die 'when activated and node aliased, did not return nvm node version'
 
+cleanup

test/fast/Unit tests/nvm_version_dir

@@ -4,7 +4,7 @@ die () { echo $@ ; exit 1; }
 
 . ../../../nvm.sh
 
-[ "$(nvm_version_dir)" = "$NVM_DIR/versions" ] || die '"nvm_version_dir" did not return new dir path'
+[ "$(nvm_version_dir)" = "$NVM_DIR/versions/node" ] || die '"nvm_version_dir" did not return new dir path'
 [ "$(nvm_version_dir new)" = "$(nvm_version_dir)" ] || die '"nvm_version_dir new" did not return new dir path'
 [ "$(nvm_version_dir old)" = "$NVM_DIR" ] || die '"nvm_version_dir old" did not return old dir path'
 [ "$(nvm_version_dir foo 2>&1)" = "unknown version dir" ] || die '"nvm_version_dir foo" did not error out'

test/fast/Unit tests/nvm_version_path

@@ -7,5 +7,5 @@ die () { echo $@ ; exit 1; }
 [ "$(nvm_version_path foo)" = "$NVM_DIR/foo" ] || die '"nvm_version_path foo" did not return correct location'
 [ "$(nvm_version_path 2>&1)" = "version is required" ] || die '"nvm_version_path" did not error out'
 [ "$(nvm_version_path v0.11.0)" = "$NVM_DIR/v0.11.0" ] || die 'old version has the wrong path'
-[ "$(nvm_version_path v0.12.0)" = "$NVM_DIR/versions/v0.12.0" ] || die 'new version has the wrong path'
+[ "$(nvm_version_path v0.12.0)" = "$NVM_DIR/versions/node/v0.12.0" ] || die 'new version has the wrong path'
 

test/installation/nvm_get_latest/nvm_get_latest

@@ -31,7 +31,7 @@ wget() {
 --2014-12-21 18:11:14--  http://latest.nvm.sh/
 Resolving latest.nvm.sh... 50.31.209.229
 Connecting to latest.nvm.sh|50.31.209.229|:80... connected.
-HTTP request sent, awaiting response... 
+HTTP request sent, awaiting response...
   HTTP/1.1 301 Moved Permanently
   Location: https://github.com/creationix/nvm/releases/latest
   Content-Type: text/html; charset=utf-8
@@ -41,7 +41,7 @@ Location: https://github.com/creationix/nvm/releases/latest [following]
 --2014-12-21 18:11:15--  https://github.com/creationix/nvm/releases/latest
 Resolving github.com... 192.30.252.130
 Connecting to github.com|192.30.252.130|:443... connected.
-HTTP request sent, awaiting response... 
+HTTP request sent, awaiting response...
   HTTP/1.1 302 Found
   Server: GitHub.com
   Date: Mon, 22 Dec 2014 02:11:15 GMT
@@ -68,7 +68,7 @@ HTTP request sent, awaiting response...
 Location: $URL [following]
 --2014-12-21 18:11:15--  $URL
 Reusing existing connection to github.com:443.
-HTTP request sent, awaiting response... 
+HTTP request sent, awaiting response...
   HTTP/1.1 200 OK
   Server: GitHub.com
   Date: Mon, 22 Dec 2014 02:11:15 GMT

test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+supports_source_options () {
+  [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
+}
+
+if ! supports_source_options; then
+  echo 'this shell does not support passing options on sourcing'
+  exit 0;
+fi
+
+echo '0.10.2' > ../../.nvmrc || die 'creation of .nvmrc failed'
+
+. ../../nvm.sh --install
+EXIT_CODE="$(echo $?)"
+
+echo 'sourcing complete.'
+
+nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: $(nvm ls)"
+
+[ "_$(nvm_rc_version | \grep -o -e 'with version .*$')" = "_with version <0.10.2>" ] || die "nvm_rc_version $(nvm_rc_version)"
+
+[ "_$EXIT_CODE" = "_0" ] || die "sourcing returned nonzero exit code: $EXIT_CODE"
+
+NVM_LS_CURRENT="$(nvm ls current | \grep -o v0.10.2)"
+[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT' `nvm ls`"
+

test/sourcing/Sourcing nvm.sh with --install should install the default

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+supports_source_options () {
+  [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
+}
+
+if ! supports_source_options; then
+  echo 'this shell does not support passing options on sourcing'
+  exit 0;
+fi
+
+echo '0.10.2' > ../../alias/default || die 'creation of default alias failed'
+
+echo 'sourcing nvm with --install...'
+
+. ../../nvm.sh --install
+EXIT_CODE="$(echo $?)"
+
+echo 'sourcing complete.'
+
+nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: $(nvm ls)"
+
+[ "_$EXIT_CODE" = "_0" ] || die "sourcing returned nonzero exit code: $EXIT_CODE"
+
+NVM_LS_CURRENT="$(nvm ls current | \grep -o v0.10.2)"
+[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT'"
+
+NVM_ALIAS_DEFAULT="$(nvm alias default)"
+[ "_$NVM_ALIAS_DEFAULT" = "_default -> 0.10.2 (-> v0.10.2)" ] \
+  || die "'nvm alias default did not return 'default -> 0.10.2 (-> v0.10.2)', got '$NVM_ALIAS_DEFAULT'"
+