[Fix] ls-remote/install: properly handle lts/x patterns

nu-cuoi-em-la-nang · Dec 17, 2021 · aed1d73 · aed1d73
1 parent 0b4cd8d
commit aed1d73
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/nvm.sh b/nvm.sh
@@ -3812,8 +3812,14 @@ nvm() {
               PATTERN="${1-}"
               if [ -z "${NVM_LTS-}" ]; then
                 case "${PATTERN}" in
-                  'lts/*') NVM_LTS='*' ;;
-                  lts/*) NVM_LTS="${PATTERN##lts/}" ;;
+                  'lts/*')
+                    NVM_LTS='*'
+                    PATTERN=''
+                  ;;
+                  lts/*)
+                    NVM_LTS="${PATTERN##lts/}"
+                    PATTERN=''
+                  ;;
                 esac
               fi
             fi

diff --git a/test/fast/Unit tests/nvm ls-remote b/test/fast/Unit tests/nvm ls-remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -ex
+set -e
 
 die () { echo "$@" ; cleanup ; exit 1; }
 
@@ -32,9 +32,18 @@ nvm_ls_remote_iojs() {
 }
 
 EXPECTED_OUTPUT_PATH="$PWD/mocks/nvm ls-remote.txt"
-
 OUTPUT="$(nvm ls-remote | sed 's/[ \t]*$//')"
 EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
 [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "bare nvm ls-remote did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
 
+EXPECTED_OUTPUT_PATH="$PWD/mocks/nvm ls-remote lts.txt"
+OUTPUT="$(nvm ls-remote --lts="*" | sed 's/[ \t]*$//')"
+EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm ls-remote --lts=* did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
+
+EXPECTED_OUTPUT_PATH="$PWD/mocks/nvm ls-remote lts.txt"
+OUTPUT="$(nvm ls-remote "lts/*" | sed 's/[ \t]*$//')"
+EXPECTED_OUTPUT="$(cat "$EXPECTED_OUTPUT_PATH" | sed 's/[ \t]*$//' )"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm ls-remote lts/* did not output expected sorted versions; got $(echo ">$OUTPUT<") expected $(echo ">$EXPECTED_OUTPUT<")"
+
 cleanup