[Fix] ls-remote: do not match on bare LTS names, eg Argon

nvm.sh

@@ -136,17 +136,15 @@ nvm_download() {
     eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} ${NVM_DOWNLOAD_ARGS}"
   elif nvm_has "wget"; then
     # Emulate curl with wget
-    ARGS=$(nvm_echo "$@" | command sed "
-      s/--progress-bar /--progress=bar /
-      s/--compressed //
-      s/--fail //
-      s/-L //
-      s/-I /--server-response /
-      s/-s /-q /
-      s/-sS /-nv /
-      s/-o /-O /
-      s/-C - /-c /
-    ")
+    ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
+                            -e 's/--compressed //' \
+                            -e 's/--fail //' \
+                            -e 's/-L //' \
+                            -e 's/-I /--server-response /' \
+                            -e 's/-s /-q /' \
+                            -e 's/-sS /-nv /' \
+                            -e 's/-o /-O /' \
+                            -e 's/-C - /-c /')
 
     if [ -n "${NVM_AUTH_HEADER:-}" ]; then
       ARGS="${ARGS} --header \"${NVM_AUTH_HEADER}\""
@@ -715,11 +713,6 @@ nvm_ensure_version_installed() {
   LOCAL_VERSION="$(nvm_version "${PROVIDED_VERSION}")"
   EXIT_CODE="$?"
   local NVM_VERSION_DIR
-
-  if [ "_$PROVIDED_VERSION" = "_N/A" ] && [ ! -d "$NVM_RC_VERSION" ] ; then
-    PROVIDED_VERSION="$(nvm_ensure_version_prefix "$NVM_RC_VERSION")"
-  fi
-
   if [ "${EXIT_CODE}" != "0" ] || ! nvm_is_version_installed "${LOCAL_VERSION}"; then
     if VERSION="$(nvm_resolve_alias "${PROVIDED_VERSION}")"; then
       nvm_err "N/A: version \"${PROVIDED_VERSION} -> ${VERSION}\" is not yet installed."
@@ -1420,11 +1413,11 @@ nvm_add_iojs_prefix() {
 nvm_strip_iojs_prefix() {
   local NVM_IOJS_PREFIX
   NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-
-  case "${1-}" in
-    "${NVM_IOJS_PREFIX}") nvm_echo ;;
-    *) nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}" ;;
-  esac
+  if [ "${1-}" = "${NVM_IOJS_PREFIX}" ]; then
+    nvm_echo
+  else
+    nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}"
+  fi
 }
 
 nvm_ls() {
@@ -1556,15 +1549,12 @@ nvm_ls() {
   fi
 
   if [ "${NVM_ADD_SYSTEM-}" = true ]; then
-    case "${PATTERN}" in
-      '' | v)
-        VERSIONS="${VERSIONS}
+    if [ -z "${PATTERN}" ] || [ "${PATTERN}" = 'v' ]; then
+      VERSIONS="${VERSIONS}
 system"
-      ;;
-      system)
-        VERSIONS="system"
-      ;;
-    esac
+    elif [ "${PATTERN}" = 'system' ]; then
+      VERSIONS="system"
+    fi
   fi
 
   if [ -z "${VERSIONS}" ]; then
@@ -1698,10 +1688,15 @@ EOF
     LTS="${LTS#lts/}"
   fi
 
-  VERSIONS="$( { command awk -v lts="${LTS-}" '{
-        if (!$1) { next }
-        if (lts && $10 ~ /^\-?$/) { next }
-        if (lts && lts != "*" && tolower($10) !~ tolower(lts)) { next }
+  VERSIONS="$({ command awk -v lts="${LTS-}" -v pattern="${PATTERN:-.*}" '
+      BEGIN {
+        if (pattern == "") pattern = ".*"
+      }
+      {
+        if (!$1) { next } # skip empty lines
+        if (lts && $10 ~ /^\-?$/) { next } # skip if LTS wanted, and row is not LTS
+        if (lts && lts != "*" && tolower($10) !~ tolower(lts)) { next } # skip if LTS filter does not match
+        if ($1 !~ pattern) { next } # only keep rows matching the pattern
         if ($10 !~ /^\-?$/) {
           if ($10 && $10 != prev) {
             print $1, $10, "*"
@@ -1713,7 +1708,6 @@ EOF
         }
         prev=$10;
       }' \
-    | nvm_grep -w "${PATTERN:-.*}" \
     | $SORT_COMMAND; } << EOF
 $VERSION_LIST
 EOF
@@ -2742,7 +2736,7 @@ nvm_npm_global_modules() {
   local NPMLIST
   local VERSION
   VERSION="$1"
-  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed -e '1d' -e '/UNMET PEER DEPENDENCY/d')
+  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed 1,1d | nvm_grep -v 'UNMET PEER DEPENDENCY')
 
   local INSTALLS
   INSTALLS=$(nvm_echo "${NPMLIST}" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*@[^ ]*\).*/\1/' -e '/^npm@[^ ]*.*$/ d' | command xargs)

package.json

@@ -45,7 +45,7 @@
     "dockerfile_lint": "^0.3.4",
     "doctoc": "^2.2.1",
     "eclint": "^2.8.1",
-    "markdown-link-check": "^3.13.6",
+    "markdown-link-check": "^3.12.2",
     "replace": "^1.2.2",
     "semver": "^7.6.3",
     "urchin": "^0.0.5"

test/fast/Unit tests/nvm_ls_remote

@@ -83,4 +83,11 @@ EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH")"
 OUTPUT="$(NVM_LTS=argon nvm_ls_remote)"
 [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "\`NVM_LTS=argon nvm_ls_remote\` did not output >$EXPECTED_OUTPUT<; got >$OUTPUT<"
 
+OUTPUT="$(nvm_ls_remote Argon 2>&1)"
+EXIT_CODE=$?
+[ $EXIT_CODE -eq 3 ] || die "nvm_ls_remote Argon did not exit 3, got '${EXIT_CODE}'"
+
+EXPECTED_OUTPUT='N/A'
+[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "nvm_ls_remote Argon did not output expected error message; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
+
 cleanup

test/slow/nvm use/Running 'nvm use' displays .nvmrc version in output messages

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-die () { echo $@ ; exit 1; }
-
-. ../../../nvm.sh
-
-echo "v0.10.28" > .nvmrc
-OUTPUT="$(nvm use 2>&1 >/dev/null | awk 'NR==1')"
-EXPECTED_OUTPUT='N/A: version "v0.10.28" is not yet installed.'
-TESTTT="$(nvm use 2>&1 >/dev/null)"
-TESTT="$(nvm use 2>&1)"
-TEST="$(nvm use)"
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use' did not output: '$EXPECTED_OUTPUT'; got: '$OUTPUT'; Normal: $TEST; with 2>&1: $TESTT; with /null: $TESTTT"
-
-OUTPUT="$(nvm use 2>&1 >/dev/null | awk 'NR==3')"
-EXPECTED_OUTPUT='You need to run "nvm install v0.10.28" to install it before using it.'
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use' did not output: '$EXPECTED_OUTPUT'; got: '$OUTPUT'"

test/slow/nvm use/setup_dir

@@ -19,9 +19,5 @@ for VERSION in "1.0.0" "1.0.1"; do
   nvm install "iojs-v$VERSION"
 done
 
-if [ -f ".nvmrc" ]; then
-  mv .nvmrc .nvmrc.bak
-fi
-
 nvm_make_alias lts/testing 0.10.1
 nvm_make_alias 'lts/*' lts/testing

test/slow/nvm use/teardown_dir

@@ -20,9 +20,3 @@ if [ -d "${NVM_DIR}/.nvm_use_lts_alias_bak" ]; then
   mv "${NVM_DIR}/.nvm_use_lts_alias_bak/*" "${NVM_DIR}/alias/lts/"
   rmdir "${NVM_DIR}/.nvm_use_lts_alias_bak"
 fi
-
-rm .nvmrc
-
-if [ -f ".nvmrc.bak" ]; then
-  mv .nvmrc.bak .nvmrc
-fi