Merge 7290bb10632417adb54c0476b10b3fcd61c457ed into 14acd3dcdd400fba1e4c2b361a8d3a042aa637e2

Fixes #3399

nvm.sh

@@ -128,7 +128,7 @@ nvm_download() {
     if nvm_curl_use_compression; then
       CURL_COMPRESSED_FLAG="--compressed"
     fi
-    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
+    eval "curl -q --fail -w %{http_code} ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -145,7 +145,7 @@ nvm_download() {
       ARGS="${ARGS} --header \"${NVM_AUTH_HEADER}\""
     fi
     # shellcheck disable=SC2086
-    eval wget $ARGS
+    eval wget -S $ARGS 2>&1 | grep '^  HTTP/' | awk '{print $2}'
   fi
 }
 
@@ -2434,12 +2434,18 @@ nvm_download_artifact() {
     nvm_err "Removing the broken local cache..."
     command rm -rf "${TARBALL}"
   fi
+
   nvm_err "Downloading ${TARBALL_URL}..."
-  nvm_download -L -C - "${PROGRESS_BAR}" "${TARBALL_URL}" -o "${TARBALL}" || (
+  local NVM_DOWNLOAD_RESULT
+  NVM_DOWNLOAD_RESULT=$(nvm_download -L -C - "${PROGRESS_BAR}" "${TARBALL_URL}" -o "${TARBALL}")
+  if [ "${NVM_DEBUG-}" = 1 ]; then
+    nvm_err "Download HTTP Status ${NVM_DOWNLOAD_RESULT}"
+  fi
+  if [ "${NVM_DOWNLOAD_RESULT}" != '200' ]; then
     command rm -rf "${TARBALL}" "${tmpdir}"
-    nvm_err "Binary download from ${TARBALL_URL} failed, trying source."
+    nvm_err "download from ${TARBALL_URL} failed"
     return 4
-  )
+  fi
 
   if nvm_grep '404 Not Found' "${TARBALL}" >/dev/null; then
     command rm -rf "${TARBALL}" "${tmpdir}"
@@ -3558,9 +3564,13 @@ 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 ]; then
+        if [ $EXIT_CODE -ne 0 ] && [ $nosource -ne 1 ]; then
           if [ -z "${NVM_MAKE_JOBS-}" ]; then
             nvm_get_make_jobs
           fi
@@ -3575,7 +3585,8 @@ nvm() {
         fi
       fi
 
-      if [ $EXIT_CODE -eq 0 ] && nvm_use_if_needed "${VERSION}" && nvm_install_npm_if_needed "${VERSION}"; then
+      if [ $EXIT_CODE -eq 0 ]; then
+        if nvm_use_if_needed "${VERSION}" && nvm_install_npm_if_needed "${VERSION}"; then
           if [ -n "${LTS-}" ]; then
             nvm_ensure_default_set "lts/${LTS}"
           else
@@ -3595,6 +3606,7 @@ nvm() {
         else
           EXIT_CODE=$?
         fi
+      fi
 
       return $EXIT_CODE
     ;;

test/fast/Unit tests/nvm install -b

@@ -0,0 +1,20 @@
+#!/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