v0.25.4

Fixes #755

.travis.yml

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

README.markdown

@@ -16,11 +16,11 @@ Note: `nvm` does not support [Fish] either (see [#303](https://github.com/creati
 
 To install you could use the [install script][2] using cURL:
 
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.25.0/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
 
 or Wget:
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.25.0/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/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>
 
@@ -220,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.25.0/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.25.4/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
 [Fish]: http://fishshell.com

bash_completion

@@ -57,7 +57,7 @@ __nvm_aliases ()
   declare aliases
   aliases=""
   if [ -d $NVM_DIR/alias ]; then
-    aliases="`cd $NVM_DIR/alias && ls`"
+    aliases="`cd $NVM_DIR/alias && command ls`"
   fi
   echo "${aliases}"
 }

install.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+{ # this ensures the entire script is downloaded #
+
 nvm_has() {
   type "$1" > /dev/null 2>&1
 }
@@ -11,7 +13,7 @@ if [ -z "$NVM_DIR" ]; then
 fi
 
 nvm_latest_version() {
-  echo "v0.25.0"
+  echo "v0.25.4"
 }
 
 #
@@ -42,7 +44,7 @@ nvm_source() {
 
 nvm_download() {
   if nvm_has "curl"; then
-    curl $*
+    curl -q $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -241,3 +243,5 @@ nvm_reset() {
 }
 
 [ "_$NVM_ENV" = "_testing" ] || nvm_do_install
+
+} # this ensures the entire script is downloaded #

nvm.sh

@@ -6,6 +6,8 @@
 # Implemented by Tim Caswell <tim@creationix.com>
 # with much bash help from Matthew Ranney
 
+{ # this ensures the entire script is downloaded #
+
 NVM_SCRIPT_SOURCE="$_"
 
 nvm_has() {
@@ -20,7 +22,7 @@ nvm_is_alias() {
 nvm_get_latest() {
   local NVM_LATEST_URL
   if nvm_has "curl"; then
-    NVM_LATEST_URL="$(curl -w "%{url_effective}\n" -L -s -S http://latest.nvm.sh -o /dev/null)"
+    NVM_LATEST_URL="$(curl -q -w "%{url_effective}\n" -L -s -S http://latest.nvm.sh -o /dev/null)"
   elif nvm_has "wget"; then
     NVM_LATEST_URL="$(wget http://latest.nvm.sh --server-response -O /dev/null 2>&1 | awk '/^  Location: /{DEST=$2} END{ print DEST }')"
   else
@@ -37,7 +39,7 @@ nvm_get_latest() {
 
 nvm_download() {
   if nvm_has "curl"; then
-    curl $*
+    curl -q $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -870,12 +872,12 @@ nvm_get_os() {
 
 nvm_get_arch() {
   local NVM_UNAME
-  NVM_UNAME="$(uname -a)"
+  NVM_UNAME="$(uname -m)"
   local NVM_ARCH
   case "$NVM_UNAME" in
-    *x86_64*) NVM_ARCH=x64 ;;
+    x86_64) NVM_ARCH="x64" ;;
-    *i*86*) NVM_ARCH=x86 ;;
+    i*86) NVM_ARCH="x86" ;;
-    *) NVM_ARCH="$(uname -m)" ;;
+    *) NVM_ARCH="$NVM_UNAME" ;;
   esac
   echo "$NVM_ARCH"
 }
@@ -929,9 +931,16 @@ nvm_install_iojs_binary() {
       tmpdir="$NVM_DIR/bin/iojs-${t}"
       local tmptarball
       tmptarball="$tmpdir/iojs-${t}.tar.gz"
-      if (
+      local NVM_INSTALL_ERRORED
       command mkdir -p "$tmpdir" && \
-        nvm_download -L -C - --progress-bar $url -o "$tmptarball" && \
+        nvm_download -L -C - --progress-bar $url -o "$tmptarball" || \
+        NVM_INSTALL_ERRORED=true
+      if grep '404 Not Found' "$tmptarball" >/dev/null; then
+        NVM_INSTALL_ERRORED=true
+        echo >&2 "HTTP 404 at URL $url";
+      fi
+      if (
+        [ "$NVM_INSTALL_ERRORED" != true ] && \
         echo "WARNING: checksums are currently disabled for io.js" >&2 && \
         # nvm_checksum "$tmptarball" $sum && \
         command tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
@@ -941,7 +950,7 @@ nvm_install_iojs_binary() {
       ); then
         return 0
       else
-        echo "Binary download failed, trying source." >&2
+        echo >&2 "Binary download failed, trying source." >&2
         command rm -rf "$tmptarball" "$tmpdir"
         return 1
       fi
@@ -983,9 +992,16 @@ nvm_install_node_binary() {
       tmpdir="$NVM_DIR/bin/node-${t}"
       local tmptarball
       tmptarball="$tmpdir/node-${t}.tar.gz"
-      if (
+      local NVM_INSTALL_ERRORED
       command mkdir -p "$tmpdir" && \
-        nvm_download -L -C - --progress-bar $url -o "$tmptarball" && \
+        nvm_download -L -C - --progress-bar $url -o "$tmptarball" || \
+        NVM_INSTALL_ERRORED=true
+      if grep '404 Not Found' "$tmptarball" >/dev/null; then
+        NVM_INSTALL_ERRORED=true
+        echo >&2 "HTTP 404 at URL $url";
+      fi
+      if (
+        [ "$NVM_INSTALL_ERRORED" != true ] && \
         nvm_checksum "$tmptarball" $sum && \
         command tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
         command rm -f "$tmptarball" && \
@@ -994,7 +1010,7 @@ nvm_install_node_binary() {
       ); then
         return 0
       else
-        echo "Binary download failed, trying source." >&2
+        echo >&2 "Binary download failed, trying source."
         command rm -rf "$tmptarball" "$tmpdir"
         return 1
       fi
@@ -1125,6 +1141,17 @@ nvm() {
       echo
     ;;
 
+    "debug" )
+      echo >&2 "\$SHELL: $SHELL"
+      echo >&2 "\$NVM_DIR: $(echo $NVM_DIR | sed "s#$HOME#\$HOME#g")"
+      for NVM_DEBUG_COMMAND in 'nvm current' 'which node' 'which iojs' 'which npm' 'npm config get prefix' 'npm root -g'
+      do
+        local NVM_DEBUG_OUTPUT="$($NVM_DEBUG_COMMAND | sed "s#$NVM_DIR#\$NVM_DIR#g")"
+        echo >&2 "$NVM_DEBUG_COMMAND: ${NVM_DEBUG_OUTPUT}"
+      done
+      return 42
+    ;;
+
     "install" | "i" )
       local nobinary
       local version_not_provided
@@ -1233,13 +1260,16 @@ nvm() {
         elif [ "$NVM_IOJS" != true ] && nvm_install_node_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
           NVM_INSTALL_SUCCESS=true
         fi
-      elif [ "$NVM_IOJS" = true ]; then
+      fi
+      if [ "$NVM_INSTALL_SUCCESS" != true ]; then
+        if [ "$NVM_IOJS" = true ]; then
           # nvm_install_iojs_source "$VERSION" "$ADDITIONAL_PARAMETERS"
           echo "Installing iojs from source is not currently supported" >&2
           return 105
         elif nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then
           NVM_INSTALL_SUCCESS=true
         fi
+      fi
 
       if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then
         if [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
@@ -1695,20 +1725,21 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       fi
 
       local NPMLIST
+      local VERSION
       if [ "_$PROVIDED_VERSION" = "_system" ]; then
         if ! nvm_has_system_node && ! nvm_has_system_iojs; then
           echo 'No system version of node or io.js detected.' >&2
           return 3
         fi
+        VERSION="system"
         NPMLIST=$(nvm deactivate > /dev/null && npm list -g --depth=0 | command tail -n +2)
       else
-        local VERSION
         VERSION="$(nvm_version "$PROVIDED_VERSION")"
         NPMLIST=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 | command tail -n +2)
       fi
 
       local INSTALLS
-      INSTALLS=$(echo "$NPMLIST" | command sed -e '/ -> / d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | command xargs)
+      INSTALLS=$(echo "$NPMLIST" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | command xargs)
 
       echo "Copying global packages from $VERSION..."
       echo "$INSTALLS" | command xargs npm install -g --quiet
@@ -1729,7 +1760,7 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       nvm_version $2
     ;;
     "--version" )
-      echo "0.25.0"
+      echo "0.25.4"
     ;;
     "unload" )
       unset -f nvm nvm_print_versions nvm_checksum \
@@ -1753,7 +1784,7 @@ nvm_supports_source_options() {
   [ "_$(echo 'echo $1' | . /dev/stdin yes 2> /dev/null)" = "_yes" ]
 }
 
-VERSION="$(nvm_alias default 2>/dev/null)"
+VERSION="$(nvm_alias default 2>/dev/null || echo)"
 if nvm_supports_source_options && [ "_$1" = "_--install" ]; then
   if [ -n "$VERSION" ]; then
     nvm install "$VERSION" >/dev/null
@@ -1765,3 +1796,5 @@ elif [ -n "$VERSION" ]; then
 elif nvm_rc_version >/dev/null 2>&1; then
   nvm use >/dev/null
 fi
+
+} # this ensures the entire script is downloaded #

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.25.0",
+  "version": "0.25.4",
   "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.3.3",
+    "semver": "^4.3.4",
     "urchin": "^0.0.5"
   }
 }

test/install_script/nvm_reset

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

test/slow/nvm_get_latest/nvm_get_latest

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

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

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