From b16b4ee6adb532ff98d69cb830e8291f93a43ac4 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sun, 30 Jun 2024 01:50:15 +0800 Subject: [PATCH] rename NVM_MIN_VER to NVM_MIN since nvm is all about versions, so no need for the explicit suffix. --- nvm.sh | 2 +- test/fast/Unit tests/nvm_print_versions | 26 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nvm.sh b/nvm.sh index f80714a..29a8d78 100755 --- a/nvm.sh +++ b/nvm.sh @@ -1883,7 +1883,7 @@ nvm_print_versions() { fi command awk \ - -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" -v min_ver="${NVM_MIN_VER:-v0}" \ + -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" -v min_ver="${NVM_MIN:-v0}" \ -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" \ diff --git a/test/fast/Unit tests/nvm_print_versions b/test/fast/Unit tests/nvm_print_versions index dc12d55..39113ec 100755 --- a/test/fast/Unit tests/nvm_print_versions +++ b/test/fast/Unit tests/nvm_print_versions @@ -6,17 +6,17 @@ die () { echo "$@" ; cleanup ; exit 1; } cleanup() { unset -f nvm_remote_versions nvm_ls nvm_ls_current nvm_remote_versions - if [ -n "$TEMP_NVM_MIN_VER" ]; then - export NVM_MIN_VER="$TEMP_NVM_MIN_VER" + if [ -n "$TEMP_NVM_MIN" ]; then + export NVM_MIN="$TEMP_NVM_MIN" fi } \. ../../../nvm.sh -if [ -n "$NVM_MIN_VER" ]; then - TEMP_NVM_MIN_VER="$NVM_MIN_VER" - unset NVM_MIN_VER +if [ -n "$NVM_MIN" ]; then + TEMP_NVM_MIN="$NVM_MIN" + unset NVM_MIN fi # mock currently installed versions @@ -72,7 +72,7 @@ v21.1.0" # versions lower than 18 should be filtered out, but v16.20.2 should be kept since it's installed -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) v18.0.0 v18.1.0 @@ -86,11 +86,11 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=18 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "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=1 NVM_MIN_VER=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) -> v18.20.3 * (Latest LTS: Hydrogen) v19.0.0 @@ -101,11 +101,11 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=19 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "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=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) -> v18.20.3 * (Latest LTS: Hydrogen) v20.8.1 @@ -113,7 +113,7 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "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 @@ -126,14 +126,14 @@ nvm_ls_current() { echo "v16.20.2" } -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="-> v16.20.2 * (Latest LTS: Gallium) v20.8.1 v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" cleanup