Merge b4ee18be6a1ba1dca0a85fdd796bc33b4984ced6 into 9a28dbd394043645943230dfa07f9c2c24358f32

nvm.sh

@@ -891,10 +891,6 @@ nvm_normalize_lts() {
       fi
     ;;
     *)
-      if [ "${LTS}" != "$(echo "${LTS}" | command tr '[:upper:]' '[:lower:]')" ]; then
-        nvm_err 'LTS names must be lowercase'
-        return 3
-      fi
       nvm_echo "${LTS}"
     ;;
   esac
@@ -1252,9 +1248,7 @@ nvm_alias() {
     nvm_err 'An alias is required.'
     return 1
   fi
-  if ! ALIAS="$(nvm_normalize_lts "${ALIAS}")"; then
+  ALIAS="$(nvm_normalize_lts "${ALIAS}")"
-    return $?
-  fi
 
   if [ -z "${ALIAS}" ]; then
     return 2
@@ -1657,9 +1651,7 @@ $VERSION_LIST
 EOF
 
   if [ -n "${LTS-}" ]; then
-    if ! LTS="$(nvm_normalize_lts "lts/${LTS}")"; then
+    LTS="$(nvm_normalize_lts "lts/${LTS}")"
-      return $?
-    fi
     LTS="${LTS#lts/}"
   fi
 
@@ -3424,11 +3416,9 @@ nvm() {
         ;;
       esac
 
-      local EXIT_CODE
       VERSION="$(NVM_VERSION_ONLY=true NVM_LTS="${LTS-}" nvm_remote_version "${provided_version}")"
-      EXIT_CODE="$?"
 
-      if [ "${VERSION}" = 'N/A' ] || [ $EXIT_CODE -ne 0 ]; then
+      if [ "${VERSION}" = 'N/A' ]; then
         local LTS_MSG
         local REMOTE_CMD
         if [ "${LTS-}" = '*' ]; then
@@ -3437,10 +3427,6 @@ nvm() {
         elif [ -n "${LTS-}" ]; then
           LTS_MSG="(with LTS filter '${LTS}') "
           REMOTE_CMD="nvm ls-remote --lts=${LTS}"
-          if [ -z "${provided_version}" ]; then
-            nvm_err "Version with LTS filter '${LTS}' not found - try \`${REMOTE_CMD}\` to browse available versions."
-            return 3
-          fi
         else
           REMOTE_CMD='nvm ls-remote'
         fi
@@ -3505,6 +3491,7 @@ nvm() {
         FLAVOR="$(nvm_node_prefix)"
       fi
 
+      local EXIT_CODE
       EXIT_CODE=0
 
       if nvm_is_version_installed "${VERSION}"; then

test/fast/Unit tests/nvm install with nonlowercase LTS name

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-die () { echo "$@" ; exit 1; }
-
-\. ../../../nvm.sh
-
-REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
-REMOTE_IOJS="${PWD}/mocks/nvm_ls_remote_iojs.txt"
-
-nvm_download() {
-  if [ "$*" = "-L -s $(nvm_get_mirror node std)/index.tab -o -" ]; then
-    cat "${REMOTE}"
-  elif [ "$*" = "-L -s $(nvm_get_mirror iojs)/index.tab -o -" ]; then
-    cat "${REMOTE_IOJS}"
-  else
-    nvm_err "unknown nvm_download call: $*"
-    return 42
-  fi
-}
-
-nvm_install_binary() {
-  return 42
-}
-nvm_install_source() {
-  return 42
-}
-
-ACTUAL="$(nvm install lts/ARGON 2>&1)"
-EXIT_CODE=$?
-[ $EXIT_CODE -eq 3 ] || die "Expected exit code of 3, got ${EXIT_CODE}"
-
-EXPECTED="LTS names must be lowercase
-Version with LTS filter 'ARGON' not found - try \`nvm ls-remote --lts=ARGON\` to browse available versions."
-
-[ "${ACTUAL}" = "${EXPECTED}" ] || die "Expected >${EXPECTED}<, got >${ACTUAL}<"

test/fast/Unit tests/nvm ls-remote

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 die () { echo "$@" ; cleanup ; exit 1; }
 
 cleanup() {
@@ -54,14 +56,6 @@ printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do
   INDEX=$(($INDEX + 1))
 done
 
-OUTPUT="$(nvm ls-remote lts/ARGON 2>&1)"
-EXIT_CODE=$?
-[ $EXIT_CODE -eq 3 ] || die "nvm ls-remote lts/ARGON did not exit 3, got '${EXIT_CODE}'"
-
-EXPECTED_OUTPUT="LTS names must be lowercase
-            N/A"
-[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "nvm ls-remote lts/ARGON did not output expected error message; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
-
 REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
 nvm_ls_remote() {
   cat "${REMOTE}"

test/fast/Unit tests/nvm_install_no_progress_bar

@@ -6,7 +6,7 @@ cleanup () {
   nvm cache clear
   nvm deactivate
   rm -rf ${NVM_DIR}/v*
-  nvm unalias default || true
+  nvm unalias default
 }
 
 die () { >&2 echo "$@" ; cleanup ; exit 1; }

test/fast/Unit tests/nvm_normalize_lts

@@ -16,9 +16,6 @@ ACTUAL="$(nvm_normalize_lts "lts/*")"
 EXPECTED='lts/*'
 [ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<"
 
-if ACTUAL="$(nvm_normalize_lts lts/ARGON)"; then
-  die "expected failure, got >${ACTUAL}<"
-fi
 
 MOCKS_DIR="../Unit tests/mocks"
 STAR="$(cat "$MOCKS_DIR/lts-star.txt")"

test/installation_node/install LTS

@@ -9,20 +9,20 @@ die () { echo "$@" ; exit 1; }
 nvm unalias default >/dev/null 2>&1 || die 'unable to unalias default'
 
 set +ex # needed for stderr
-OUTPUT="$(nvm install --lts 0.12 2>&1)"
+OUTPUT="$(nvm install --lts 3 2>&1)"
-EXIT_CODE="$?"
 set -ex
-EXPECTED_OUTPUT="Version '0.12' (with LTS filter) not found - try \`nvm ls-remote --lts\` to browse available versions."
+EXIT_CODE="$(nvm install --lts 3 >/dev/null 2>&1 && echo $? || echo $?)"
-[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts 0.12\` did not exit with 3, got >${EXIT_CODE}<"
+EXPECTED_OUTPUT="Version '3' (with LTS filter) not found - try \`nvm ls-remote --lts\` to browse available versions."
+[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts 3\` did not exit with 3, got >${EXIT_CODE}<"
 [ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
 
 set +ex # needed for stderr
-OUTPUT="$(nvm install --lts=argon 0.12 2>&1)"
+OUTPUT="$(nvm install --lts=argon 3 2>&1)"
-EXIT_CODE="$?"
+set -ex
-set -x
+EXIT_CODE="$(nvm install --lts=argon 3 >/dev/null 2>&1 && echo $? || echo $?)"
-EXPECTED_OUTPUT="Version '0.12' (with LTS filter 'argon') not found - try \`nvm ls-remote --lts=argon\` to browse available versions."
+EXPECTED_OUTPUT="Version '3' (with LTS filter 'argon') not found - try \`nvm ls-remote --lts=argon\` to browse available versions."
-[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts=argon 0.12\` did not exit with 3, got >${EXIT_CODE}<"
+[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts=argon 3\` did not exit with 3, got >${EXIT_CODE}<"
-[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 0.12\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
+[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
 
 nvm install --lts 4.2.2 || die 'nvm install --lts 4.2.2 failed'