[Fix] nvm_ls_remote_index_tab: only compare the pattern to the version, not the LTS name

Fixes 3474

.github/workflows/tests.yml

@@ -1,6 +1,6 @@
 name: urchin tests
 
-on: [push]
+on: [push, pull_request]
 
 permissions:
   contents: read

CONTRIBUTING.md

@@ -113,3 +113,11 @@ Co-authored-by: Name Here <email@here>
 
 # Where can I ask for help?
 If you have any questions, please contact [@LJHarb](mailto:ljharb@gmail.com).
+
+# Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+  - The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
+  - The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
+  - The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
+  - I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.

README.md

@@ -588,9 +588,7 @@ Run [`npx nvmrc`](https://npmjs.com/nvmrc) to validate an `.nvmrc` file. If that
 
 ### Deeper Shell Integration
 
-You can use [`avn`](https://github.com/wbyoung/avn) to deeply integrate into your shell and automatically invoke `nvm` when changing directories. `avn` is **not** supported by the `nvm` maintainers. Please [report issues to the `avn` team](https://github.com/wbyoung/avn/issues/new).
-
-You can also use [`nvshim`](https://github.com/iamogbz/nvshim) to shim the `node`, `npm`, and `npx` bins to automatically use the `nvm` config in the current directory. `nvshim` is **not** supported by the `nvm` maintainers. Please [report issues to the `nvshim` team](https://github.com/iamogbz/nvshim/issues/new).
+You can use [`nvshim`](https://github.com/iamogbz/nvshim) to shim the `node`, `npm`, and `npx` bins to automatically use the `nvm` config in the current directory. `nvshim` is **not** supported by the `nvm` maintainers. Please [report issues to the `nvshim` team](https://github.com/iamogbz/nvshim/issues/new).
 
 If you prefer a lighter-weight solution, the recipes below have been contributed by `nvm` users. They are **not** supported by the `nvm` maintainers. We are, however, accepting pull requests for more examples.
 

install.sh

@@ -296,17 +296,17 @@ nvm_detect_profile() {
       DETECTED_PROFILE="$HOME/.bash_profile"
     fi
   elif [ "${SHELL#*zsh}" != "$SHELL" ]; then
-    if [ -f "$HOME/.zshrc" ]; then
-      DETECTED_PROFILE="$HOME/.zshrc"
-    elif [ -f "$HOME/.zprofile" ]; then
-      DETECTED_PROFILE="$HOME/.zprofile"
+    if [ -f "${ZDOTDIR:-${HOME}}/.zshrc" ]; then
+      DETECTED_PROFILE="${ZDOTDIR:-${HOME}}/.zshrc"
+    elif [ -f "${ZDOTDIR:-${HOME}}/.zprofile" ]; then
+      DETECTED_PROFILE="${ZDOTDIR:-${HOME}}/.zprofile"
     fi
   fi
 
   if [ -z "$DETECTED_PROFILE" ]; then
     for EACH_PROFILE in ".profile" ".bashrc" ".bash_profile" ".zprofile" ".zshrc"
     do
-      if DETECTED_PROFILE="$(nvm_try_profile "${HOME}/${EACH_PROFILE}")"; then
+      if DETECTED_PROFILE="$(nvm_try_profile "${ZDOTDIR:-${HOME}}/${EACH_PROFILE}")"; then
         break
       fi
     done

nvm.sh

@@ -1667,10 +1667,11 @@ EOF
     LTS="${LTS#lts/}"
   fi
 
-  VERSIONS="$({ command awk -v lts="${LTS-}" '{
+  VERSIONS="$({ command awk -v lts="${LTS-}" -v pattern="${PATTERN:-.*}" '{
         if (!$1) { next }
         if (lts && $10 ~ /^\-?$/) { next }
         if (lts && lts != "*" && tolower($10) !~ tolower(lts)) { next }
+        if ($1 !~ pattern) { next }
         if ($10 !~ /^\-?$/) {
           if ($10 && $10 != prev) {
             print $1, $10, "*"
@@ -1682,7 +1683,6 @@ EOF
         }
         prev=$10;
       }' \
-    | nvm_grep -w "${PATTERN:-.*}" \
     | $SORT_COMMAND; } << EOF
 $VERSION_LIST
 EOF
@@ -1857,15 +1857,12 @@ nvm_print_versions() {
   fi
 
   command awk \
-    -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" -v min="${NVM_MIN:-v0}" \
+    -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" \
     -v installed_versions="$(nvm_ls | tr '\n' '|')" -v current="$NVM_CURRENT" \
     -v installed_color="$INSTALLED_COLOR" -v system_color="$SYSTEM_COLOR" \
     -v current_color="$CURRENT_COLOR" -v default_color="$DEFAULT_COLOR" \
     -v old_lts_color="$DEFAULT_COLOR" -v has_colors="$NVM_HAS_COLORS" '
 function alen(arr, i, len) { len=0; for(i in arr) len++; return len; }
-function v2a(v, a) { sub(/^(iojs-)?v/, "", v); split(v, a, "."); }
-function v2m(v, a) { sub(/^(iojs-)?v/, "", v); split(v, a, "."); return a[1]; }
-function vcmp(v1,v2,a1,a2,i,d) { v2a(v1,a1); v2a(v2,a2); for(i=1;i<4;i++) { d = a1[i] - a2[i]; if(d!=0) return d; } return 0; }
 BEGIN {
   fmt_installed = has_colors ? (installed_color ? "\033[" installed_color "%15s\033[0m" : "%15s") : "%15s *";
   fmt_system = has_colors ? (system_color ? "\033[" system_color "%15s\033[0m" : "%15s") : "%15s *";
@@ -1880,13 +1877,13 @@ BEGIN {
   split(remote_versions, lines, "|");
   split(installed_versions, installed, "|");
   rows = alen(lines);
-  filter_on = (vcmp("v0.0.0", min) != 0);
-  current_major = -1;
-  for (m = n = 1; n <= rows; n++) {
+
+  for (n = 1; n <= rows; n++) {
     split(lines[n], fields, "[[:blank:]]+");
     cols = alen(fields);
     version = fields[1];
     is_installed = 0;
+
     for (i in installed) {
       if (version == installed[i]) {
         is_installed = 1;
@@ -1894,16 +1891,6 @@ BEGIN {
       }
     }
 
-    if (filter_on != 0) {
-      if (is_installed) {
-        current_major = v2m(version);
-      } else if (vcmp(version, min) >= 0) {
-        filter_on = 0;
-      } else if (v2m(version) != current_major) {
-        continue;
-      }
-    }
-
     fmt_version = "%15s";
     if (version == current) {
       fmt_version = fmt_current;
@@ -1913,7 +1900,8 @@ BEGIN {
       fmt_version = fmt_installed;
     }
 
-    padding = (is_installed && !has_colors) ? "" : "  ";
+    padding = (!has_colors && is_installed) ? "" : "  ";
+
     if (cols == 1) {
       formatted = sprintf(fmt_version, version);
     } else if (cols == 2) {
@@ -1922,10 +1910,10 @@ BEGIN {
       formatted = sprintf((fmt_version padding fmt_latest_lts), version, fields[2]);
     }
 
-    output[m++] = formatted;
+    output[n] = formatted;
   }
 
-  for (n = 1; n < m; n++) {
+  for (n = 1; n <= rows; n++) {
     print output[n]
   }
 
@@ -3092,7 +3080,6 @@ nvm() {
         nvm_echo '  nvm ls-remote [<version>]                   List remote versions available for install, matching a given <version> if provided'
         nvm_echo '    --lts                                     When listing, only show LTS (long-term support) versions'
         nvm_echo '    --lts=<LTS name>                          When listing, only show versions for a specific LTS line'
-        nvm_echo '    --min=<version>                           When listing, only show versions greater than or equal to <version>, including minor/patch updates for installed versions'
         nvm_echo '    --no-colors                               Suppress colored output'
         nvm_echo '  nvm version <version>                       Resolve the given description to a single local version'
         nvm_echo '  nvm version-remote <version>                Resolve the given description to a single remote version'
@@ -4111,10 +4098,6 @@ nvm() {
       local NVM_LTS
       local PATTERN
       local NVM_NO_COLORS
-      local NVM_MIN_ENV
-      NVM_MIN_ENV="${NVM_MIN-}"
-      local NVM_MIN
-      NVM_MIN="${NVM_MIN_ENV-}"
 
       while [ $# -gt 0 ]; do
         case "${1-}" in
@@ -4125,9 +4108,6 @@ nvm() {
           --lts=*)
             NVM_LTS="${1##--lts=}"
           ;;
-          --min=*)
-            NVM_MIN="${1##--min=}"
-          ;;
           --no-colors) NVM_NO_COLORS="${1}" ;;
           --*)
             nvm_err "Unsupported option \"${1}\"."

test/fast/Unit tests/nvm_print_versions

@@ -1,146 +0,0 @@
-#!/bin/sh
-
-# shellcheck disable=SC2317
-
-die () { echo "$@" ; cleanup ; exit 1; }
-
-cleanup() {
-  unset -f nvm_remote_versions nvm_ls nvm_ls_current
-  if [ -n "$TEMP_NVM_MIN" ]; then
-    export NVM_MIN="$TEMP_NVM_MIN"
-    unset TEMP_NVM_MIN
-  fi
-}
-
-\. ../../../nvm.sh
-
-
-if [ -n "$NVM_MIN" ]; then
-  TEMP_NVM_MIN="$NVM_MIN"
-  unset NVM_MIN
-fi
-
-# mock currently installed versions
-nvm_ls() {
-  echo "v16.20.2
-v18.20.3
-system"
-}
-
-# mock currently active version
-nvm_ls_current() {
-  echo "v18.20.3"
-}
-
-nvm_remote_versions() {
-  echo "v16.0.0
-v16.20.2 Gallium
-v16.20.3 Gallium *
-v17.0.0
-v17.9.1
-v18.0.0
-v18.1.0
-v18.20.2 Hydrogen
-v18.20.3 Hydrogen *
-v19.0.0
-v19.9.0
-v20.0.0
-v20.8.1
-v20.9.0 Iron *
-v21.0.0
-v21.1.0"
-}
-
-
-# nvm_print_versions should print all versions from nvm_remote_versions
-OUTPUT="$(NVM_NO_COLORS='--no-colors' nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
-EXPECTED_OUTPUT="v16.0.0
-v16.20.2 * (LTS: Gallium)
-v16.20.3   (Latest LTS: Gallium)
-v17.0.0
-v17.9.1
-v18.0.0
-v18.1.0
-v18.20.2   (LTS: Hydrogen)
-->     v18.20.3 * (Latest LTS: Hydrogen)
-v19.0.0
-v19.9.0
-v20.0.0
-v20.8.1
-v20.9.0   (Latest LTS: Iron)
-v21.0.0
-v21.1.0"
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(1) nvm_print_versions did not output all expected versions; got $OUTPUT"
-
-
-# versions lower than 18 should be filtered out, but v16.20.2 should be kept since it's installed
-OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=v18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
-EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
-v16.20.3   (Latest LTS: Gallium)
-v18.0.0
-v18.1.0
-v18.20.2   (LTS: Hydrogen)
-->     v18.20.3 * (Latest LTS: Hydrogen)
-v19.0.0
-v19.9.0
-v20.0.0
-v20.8.1
-v20.9.0   (Latest LTS: Iron)
-v21.0.0
-v21.1.0"
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(2) NVM_MIN=18 nvm_print_versions did not output all expected versions; got $OUTPUT"
-
-
-# versions lower than 19 should be filtered out
-OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
-EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
-v16.20.3   (Latest LTS: Gallium)
-->     v18.20.3 * (Latest LTS: Hydrogen)
-v19.0.0
-v19.9.0
-v20.0.0
-v20.8.1
-v20.9.0   (Latest LTS: Iron)
-v21.0.0
-v21.1.0"
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(3) NVM_MIN=19 nvm_print_versions did not output all expected versions; got $OUTPUT"
-
-
-# versions lower than 20.1 should be filtered out, so v20.0.0 is out
-OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=v20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
-EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
-v16.20.3   (Latest LTS: Gallium)
-->     v18.20.3 * (Latest LTS: Hydrogen)
-v20.8.1
-v20.9.0   (Latest LTS: Iron)
-v21.0.0
-v21.1.0"
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(4) NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT"
-
-
-# assume v18.20.3 is NOT installed, so now it should be filtered out
-nvm_ls() {
-  echo "v16.20.2
-system"
-}
-
-nvm_ls_current() {
-  echo "v16.20.2"
-}
-
-OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
-EXPECTED_OUTPUT="->     v16.20.2 * (LTS: Gallium)
-v16.20.3   (Latest LTS: Gallium)
-v20.8.1
-v20.9.0   (Latest LTS: Iron)
-v21.0.0
-v21.1.0"
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(5) NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT"
-
-
-cleanup

test/install_script/nvm_detect_profile

@@ -3,12 +3,16 @@
 setup () {
   HOME="."
   NVM_ENV=testing \. ../../install.sh
+  ZDOTDIR="$HOME/zdotdir"
+  mkdir -p zdotdir
   touch ".bashrc"
   touch ".bash_profile"
   touch ".zprofile"
   touch ".zshrc"
   touch ".profile"
   touch "test_profile"
+  touch "zdotdir/.zshrc"
+  touch "zdotdir/.zprofile"
 }
 
 cleanup () {
@@ -17,7 +21,9 @@ cleanup () {
   unset NVM_DETECT_PROFILE
   unset SHELL
   unset -f setup cleanup die
+  unset ZDOTDIR
   rm -f ".bashrc" ".bash_profile" ".zprofile" ".zshrc" ".profile" "test_profile" > "/dev/null" 2>&1
+  rm -rf zdotdir 2>&1
 }
 
 die () { echo "$@" '$NVM_DETECT_PROFILE:' "$NVM_DETECT_PROFILE"; cleanup; exit 1; }
@@ -29,49 +35,54 @@ setup
 #
 
 # setting $PROFILE to /dev/null should return no detected profile
-NVM_DETECT_PROFILE="$(PROFILE='/dev/null'; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(PROFILE='/dev/null' nvm_detect_profile)"
 if [ -n "$NVM_DETECT_PROFILE" ]; then
   die "nvm_detect_profile still detected a profile even though PROFILE=/dev/null"
 fi
 
 # .bashrc should be detected for bash
-NVM_DETECT_PROFILE="$(SHELL="/bin/bash"; unset PROFILE; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/bash" PROFILE= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then
   die "nvm_detect_profile didn't pick \$HOME/.bashrc for bash"
 fi
 
 # $PROFILE should override .bashrc profile detection
-NVM_DETECT_PROFILE="$(SHELL="/bin/bash"; PROFILE="test_profile"; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/bash" PROFILE="test_profile" nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then
   die "nvm_detect_profile ignored \$PROFILE"
 fi
 
+# zdotdir/.zshrc should be detected for zsh
+NVM_DETECT_PROFILE="$(SHELL="/bin/zsh" PROFILE= nvm_detect_profile)"
+if [ "$NVM_DETECT_PROFILE" != "$ZDOTDIR/.zshrc" ]; then
+  die "nvm_detect_profile didn't pick \$ZDOTDIR/.zshrc for zsh"
+fi
+
 # .zshrc should be detected for zsh
-NVM_DETECT_PROFILE="$(SHELL="/bin/zsh"; unset PROFILE; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/zsh" PROFILE= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then
   die "nvm_detect_profile didn't pick \$HOME/.zshrc for zsh"
 fi
 
 # $PROFILE should override .zshrc profile detection
-NVM_DETECT_PROFILE="$(SHELL="/usr/bin/zsh"; PROFILE="test_profile"; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/usr/bin/zsh" PROFILE="test_profile" nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then
   die "nvm_detect_profile ignored \$PROFILE"
 fi
 
-
 #
 # Confirm $PROFILE is only returned when it points to a valid file
 #
 
 # $PROFILE is a valid file
-NVM_DETECT_PROFILE="$(PROFILE="test_profile"; unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(PROFILE="test_profile" SHELL= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then
   die "nvm_detect_profile didn't pick \$PROFILE when it was a valid file"
 fi
 
 # $PROFILE is not a valid file
 rm "test_profile"
-NVM_DETECT_PROFILE="$(PROFILE="test_profile"; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(PROFILE="test_profile" nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" = "test_profile" ]; then
   die "nvm_detect_profile picked \$PROFILE when it was an invalid file"
 fi
@@ -83,44 +94,58 @@ fi
 #
 
 # It should favor .profile if file exists
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.profile" ]; then
-  die "nvm_detect_profile should have selected .profile"
+  die "nvm_detect_profile should have selected .profile; got $NVM_DETECT_PROFILE"
 fi
 
 # Otherwise, it should favor .bashrc if file exists
 rm ".profile"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then
-  die "nvm_detect_profile should have selected .bashrc"
+  die "nvm_detect_profile should have selected .bashrc; got $NVM_DETECT_PROFILE"
 fi
 
 # Otherwise, it should favor .bash_profile if file exists
 rm ".bashrc"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.bash_profile" ]; then
-  die "nvm_detect_profile should have selected .bash_profile"
+  die "nvm_detect_profile should have selected .bash_profile; got $NVM_DETECT_PROFILE"
+fi
+
+# Otherwise, it should favor zdotdir/.zprofile if file exists
+rm ".bash_profile"
+NVM_DETECT_PROFILE="$(SHELL= nvm_detect_profile)"
+if [ "$NVM_DETECT_PROFILE" != "$ZDOTDIR/.zprofile" ]; then
+  die "nvm_detect_profile should have selected zdotdir/.zprofile; got $NVM_DETECT_PROFILE"
 fi
 
 # Otherwise, it should favor .zprofile if file exists
-rm ".bash_profile"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+rm "zdotdir/.zprofile"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zprofile" ]; then
-  die "nvm_detect_profile should have selected .zprofile"
+  die "nvm_detect_profile should have selected .zprofile; got $NVM_DETECT_PROFILE"
+fi
+
+# Otherwise, it should favor zdotdir/.zshrc if file exists
+rm ".zprofile"
+NVM_DETECT_PROFILE="$(SHELL= nvm_detect_profile)"
+if [ "$NVM_DETECT_PROFILE" != "$ZDOTDIR/.zshrc" ]; then
+  die "nvm_detect_profile should have selected zdotdir/.zshrc; got $NVM_DETECT_PROFILE"
 fi
 
 # Otherwise, it should favor .zshrc if file exists
-rm ".zprofile"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+rm "zdotdir/.zshrc"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then
-  die "nvm_detect_profile should have selected .zshrc"
+  die "nvm_detect_profile should have selected .zshrc; got $NVM_DETECT_PROFILE"
 fi
 
 # It should be empty if none is found
 rm ".zshrc"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= nvm_detect_profile)"
 if [ ! -z "$NVM_DETECT_PROFILE" ]; then
-  die "nvm_detect_profile should have returned an empty value"
+  die "nvm_detect_profile should have returned an empty value; got $NVM_DETECT_PROFILE"
 fi
 
 cleanup