From 24c60e4e51145aec192fc315054b72ad746c2906 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Fri, 23 Jan 2015 10:59:49 -0800 Subject: [PATCH] Fix a bug in nvm_remote_version that was breaking `nvm install stable`/`nvm install unstable`. Fixes #630. --- nvm.sh | 2 +- test/fast/Unit tests/nvm_remote_version | 27 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/nvm.sh b/nvm.sh index 08bbaab..34ef62c 100644 --- a/nvm.sh +++ b/nvm.sh @@ -218,7 +218,7 @@ nvm_remote_version() { PATTERN="$1" local VERSION if nvm_validate_implicit_alias "$PATTERN" 2> /dev/null ; then - VERSIONS="$(nvm_ls_remote "$PATTERN")" + VERSION="$(nvm_ls_remote "$PATTERN")" else case "_$PATTERN" in "_$(nvm_node_prefix)") diff --git a/test/fast/Unit tests/nvm_remote_version b/test/fast/Unit tests/nvm_remote_version index 16b6e3c..60b0774 100755 --- a/test/fast/Unit tests/nvm_remote_version +++ b/test/fast/Unit tests/nvm_remote_version @@ -26,9 +26,18 @@ EXIT_CODE="$(nvm_remote_version iojs-foo >/dev/null 2>&1 ; echo $?)" nvm_ls_remote() { - echo "test output" - echo "more test output" - echo "pattern received: _$1_" + if ! nvm_is_iojs_version "$1"; then + echo "test output" + echo "more test output" + echo "pattern received: _$1_" + fi +} +nvm_ls_remote_iojs() { + if nvm_is_iojs_version "$1"; then + echo "test iojs output" + echo "more iojs test output" + echo "iojs pattern received: _$1_" + fi } OUTPUT="$(nvm_remote_version foo)" EXIT_CODE="$(nvm_remote_version foo >/dev/null 2>&1 ; echo $?)" @@ -36,17 +45,17 @@ EXIT_CODE="$(nvm_remote_version foo >/dev/null 2>&1 ; echo $?)" || die "nvm_remote_version foo did not return last line only of nvm_ls_remote foo; got $OUTPUT" [ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version foo did not exit with 0, got $EXIT_CODE" -nvm_ls_remote_iojs() { - echo "test iojs output" - echo "more iojs test output" - echo "iojs pattern received: _$1_" - -} OUTPUT="$(nvm_remote_version iojs-foo)" EXIT_CODE="$(nvm_remote_version iojs-foo >/dev/null 2>&1 ; echo $?)" [ "_$OUTPUT" = "_iojs pattern received: _iojs-foo_" ] \ || die "nvm_remote_version iojs-foo did not return last line only of nvm_ls_remote_iojs foo; got $OUTPUT" [ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version iojs-foo did not exit with 0, got $EXIT_CODE" +OUTPUT="$(nvm_remote_version stable)" +EXIT_CODE="$(nvm_remote_version stable >/dev/null 2>&1 ; echo $?)" +[ "_$OUTPUT" = "_$(nvm_ls_remote stable)" ] \ + || die "nvm_remote_version stable did not return contents of nvm_ls_remote stable; got $OUTPUT" +[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version stable did not exit with 0, got $EXIT_CODE" + cleanup