v0.25.1

Fixes #744.

.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 https://raw.githubusercontent.com/creationix/nvm/v0.25.1/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.1/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.1/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
 [Fish]: http://fishshell.com

install.sh

@@ -11,7 +11,7 @@ if [ -z "$NVM_DIR" ]; then
 fi
 
 nvm_latest_version() {
-  echo "v0.25.0"
+  echo "v0.25.1"
 }
 
 #
@@ -42,7 +42,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 /' \

nvm.sh

@@ -20,7 +20,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 +37,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 +870,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 +929,16 @@ nvm_install_iojs_binary() {
       tmpdir="$NVM_DIR/bin/iojs-${t}"
       local tmptarball
       tmptarball="$tmpdir/iojs-${t}.tar.gz"
+      local NVM_INSTALL_ERRORED
+      command mkdir -p "$tmpdir" && \
+        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 (
-        command mkdir -p "$tmpdir" && \
+        [ "$NVM_INSTALL_ERRORED" != true ] && \
-        nvm_download -L -C - --progress-bar $url -o "$tmptarball" && \
         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 +948,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 +990,16 @@ nvm_install_node_binary() {
       tmpdir="$NVM_DIR/bin/node-${t}"
       local tmptarball
       tmptarball="$tmpdir/node-${t}.tar.gz"
+      local NVM_INSTALL_ERRORED
+      command mkdir -p "$tmpdir" && \
+        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 (
-        command mkdir -p "$tmpdir" && \
+        [ "$NVM_INSTALL_ERRORED" != true ] && \
-        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" && \
@@ -994,7 +1008,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
@@ -1233,12 +1247,15 @@ 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
-        # nvm_install_iojs_source "$VERSION" "$ADDITIONAL_PARAMETERS"
+      if [ "$NVM_INSTALL_SUCCESS" != true ]; then
-        echo "Installing iojs from source is not currently supported" >&2
+        if [ "$NVM_IOJS" = true ]; then
-        return 105
+          # nvm_install_iojs_source "$VERSION" "$ADDITIONAL_PARAMETERS"
-      elif nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then
+          echo "Installing iojs from source is not currently supported" >&2
-        NVM_INSTALL_SUCCESS=true
+          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
@@ -1729,7 +1746,7 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       nvm_version $2
     ;;
     "--version" )
-      echo "0.25.0"
+      echo "0.25.1"
     ;;
     "unload" )
       unset -f nvm nvm_print_versions nvm_checksum \

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
   "directories": {
     "test": "test"

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
 }