nvm.sh

@@ -2437,7 +2437,7 @@ nvm_download_artifact() {
   nvm_err "Downloading ${TARBALL_URL}..."
   nvm_download -L -C - "${PROGRESS_BAR}" "${TARBALL_URL}" -o "${TARBALL}" || (
     command rm -rf "${TARBALL}" "${tmpdir}"
-    nvm_err "download from ${TARBALL_URL} failed"
+    nvm_err "Binary download from ${TARBALL_URL} failed, trying source."
     return 4
   )
 
@@ -3558,13 +3558,9 @@ nvm() {
           EXIT_CODE=$?
         else
           EXIT_CODE=-1
-          if [ $nosource -eq 1 ]; then
-            nvm_err "Binary download is not available for ${VERSION}"
-            EXIT_CODE=3
-          fi
         fi
 
-        if [ $EXIT_CODE -ne 0 ] && [ $nosource -ne 1 ]; then
+        if [ $EXIT_CODE -ne 0 ]; then
           if [ -z "${NVM_MAKE_JOBS-}" ]; then
             nvm_get_make_jobs
           fi
@@ -3579,8 +3575,7 @@ nvm() {
         fi
       fi
 
-      if [ $EXIT_CODE -eq 0 ]; then
-        if nvm_use_if_needed "${VERSION}" && nvm_install_npm_if_needed "${VERSION}"; then
+      if [ $EXIT_CODE -eq 0 ] && nvm_use_if_needed "${VERSION}" && nvm_install_npm_if_needed "${VERSION}"; then
         if [ -n "${LTS-}" ]; then
           nvm_ensure_default_set "lts/${LTS}"
         else
@@ -3600,7 +3595,6 @@ nvm() {
       else
         EXIT_CODE=$?
       fi
-      fi
 
       return $EXIT_CODE
     ;;

test/fast/Unit tests/nvm install -b

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-die () { echo "$@" ; exit 1; }
-
-\. ../../../nvm.sh
-
-nvm_install_source() {
-  exit 42
-}
-
-VERSION="0.7.0"
-
-EXIT_CODE=$(nvm install -b "${VERSION}" ; echo $?)
-
-[ $EXIT_CODE -eq 3 ] || die "Expected exit code 3, got ${EXIT_CODE}"
-
-ACTUAL="$(nvm install -b "${VERSION}" 2>&1)"
-EXPECTED="Binary download is not available for v${VERSION}"
-
-[ "${ACTUAL}" = "${EXPECTED}" ] || die "Expected >${EXPECTED}<, got >${ACTUAL}<"

test/fast/Unit tests/nvm ls-remote

@@ -6,14 +6,14 @@ die () { echo "$@" ; cleanup ; exit 1; }
 
 cleanup() {
   unset -f nvm_download nvm_ls_remote nvm_ls_remote_iojs
-  if [ -n "${TEMP_NVM_COLORS-}" ]; then
+  if [ -n TEMP_NVM_COLORS ]; then
     export NVM_COLORS=TEMP_NVM_COLORS
   fi
   unset TEMP_NVM_COLORS
 }
 
 \. ../../../nvm.sh
-if [ -n "${NVM_COLORS-}" ]; then
+if [ -n ${NVM_COLORS} ]; then
   export TEMP_NVM_COLORS=NVM_COLORS
   unset NVM_COLORS
 fi