ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-05-10 14:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

always show updates for installed versions

Browse Source 
even if they're older than $NVM_MIN
This commit is contained in:
ryenus 2024-07-14 14:18:11 +08:00
parent 858eda58c4
commit 54a5777ff8
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nvm.sh
View File

@ -1890,6 +1890,7 @@ nvm_print_versions() {
-v old_lts_color="$DEFAULT_COLOR" -v has_colors="$NVM_HAS_COLORS" ' -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 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 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; } 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 { BEGIN {
fmt_installed = has_colors ? (installed_color ? "\033[" installed_color "%15s\033[0m" : "%15s") : "%15s *"; fmt_installed = has_colors ? (installed_color ? "\033[" installed_color "%15s\033[0m" : "%15s") : "%15s *";
@ -1906,6 +1907,7 @@ BEGIN {
split(installed_versions, installed, "|"); split(installed_versions, installed, "|");
rows = alen(lines); rows = alen(lines);
filter_on = (vcmp("v0.0.0", min_ver) != 0); filter_on = (vcmp("v0.0.0", min_ver) != 0);
current_major = -1;
for (m = n = 1; n <= rows; n++) { for (m = n = 1; n <= rows; n++) {
split(lines[n], fields, "[[:blank:]]+"); split(lines[n], fields, "[[:blank:]]+");
cols = alen(fields); cols = alen(fields);
@ -1918,10 +1920,12 @@ BEGIN {
} }
} }
if (filter_on && !is_installed) { if (filter_on != 0) {
if (vcmp(version, min_ver) >= 0) { if (is_installed) {
current_major = v2m(version);
} else if (vcmp(version, min_ver) >= 0) {
filter_on = 0; filter_on = 0;
} else { } else if (v2m(version) != current_major) {
continue; continue;
} }
} }

28
test/fast/Unit tests/nvm_print_versions
View File

@ -33,7 +33,8 @@ nvm_ls_current() {
nvm_remote_versions() { nvm_remote_versions() {
echo "v16.0.0 echo "v16.0.0
v16.20.2 Gallium * v16.20.2 Gallium
v16.20.3 Gallium *
v17.0.0 v17.0.0
v17.9.1 v17.9.1
v18.0.0 v18.0.0
@ -53,7 +54,8 @@ v21.1.0"
# nvm_print_versions should print all versions from nvm_remote_versions # nvm_print_versions should print all versions from nvm_remote_versions
OUTPUT="$(NVM_NO_COLORS=1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" OUTPUT="$(NVM_NO_COLORS=1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
EXPECTED_OUTPUT="v16.0.0 EXPECTED_OUTPUT="v16.0.0
v16.20.2 * (Latest LTS: Gallium) v16.20.2 * (LTS: Gallium)
v16.20.3 (Latest LTS: Gallium)
v17.0.0 v17.0.0
v17.9.1 v17.9.1
v18.0.0 v18.0.0
@ -68,12 +70,13 @@ v20.9.0 (Latest LTS: Iron)
v21.0.0 v21.0.0
v21.1.0" v21.1.0"
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_print_versions did not output all expected versions; got $OUTPUT" [ "_$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 # 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=v18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=v18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
v16.20.3 (Latest LTS: Gallium)
v18.0.0 v18.0.0
v18.1.0 v18.1.0
v18.20.2 (LTS: Hydrogen) v18.20.2 (LTS: Hydrogen)
@ -86,12 +89,13 @@ v20.9.0 (Latest LTS: Iron)
v21.0.0 v21.0.0
v21.1.0" v21.1.0"
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=18 nvm_print_versions did not output all expected versions; got $OUTPUT" [ "_$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 # versions lower than 19 should be filtered out
OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=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) EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
v16.20.3 (Latest LTS: Gallium)
-> v18.20.3 * (Latest LTS: Hydrogen) -> v18.20.3 * (Latest LTS: Hydrogen)
v19.0.0 v19.0.0
v19.9.0 v19.9.0
@ -101,19 +105,20 @@ v20.9.0 (Latest LTS: Iron)
v21.0.0 v21.0.0
v21.1.0" v21.1.0"
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=19 nvm_print_versions did not output all expected versions; got $OUTPUT" [ "_$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 # versions lower than 20.1 should be filtered out, so v20.0.0 is out
OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=v20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=v20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
v16.20.3 (Latest LTS: Gallium)
-> v18.20.3 * (Latest LTS: Hydrogen) -> v18.20.3 * (Latest LTS: Hydrogen)
v20.8.1 v20.8.1
v20.9.0 (Latest LTS: Iron) v20.9.0 (Latest LTS: Iron)
v21.0.0 v21.0.0
v21.1.0" v21.1.0"
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" [ "_$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 # assume v18.20.3 is NOT installed, so now it should be filtered out
@ -127,13 +132,14 @@ nvm_ls_current() {
} }
OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=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) EXPECTED_OUTPUT="-> v16.20.2 * (LTS: Gallium)
v16.20.3 (Latest LTS: Gallium)
v20.8.1 v20.8.1
v20.9.0 (Latest LTS: Iron) v20.9.0 (Latest LTS: Iron)
v21.0.0 v21.0.0
v21.1.0" v21.1.0"
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(5) NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT"
cleanup cleanup