From cc0750eb5dbedb2b72d9bf6e5e1fde9a492137b9 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 22 Jan 2019 15:46:29 +0800 Subject: [PATCH] [Fix] `install`: Add missing io.js installation message Fixes #1988 --- nvm.sh | 2 ++ test/installation_iojs/install from binary | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nvm.sh b/nvm.sh index 2232d85..5581998 100644 --- a/nvm.sh +++ b/nvm.sh @@ -1721,6 +1721,8 @@ nvm_install_binary() { local NODE_OR_IOJS if [ "${FLAVOR}" = 'node' ]; then NODE_OR_IOJS="${FLAVOR}" + elif [ "${FLAVOR}" = 'iojs' ]; then + NODE_OR_IOJS="io.js" fi if [ "${NVM_NO_PROGRESS-}" = "1" ]; then # --silent, --show-error, use short option as @samrocketman mentions the compatibility issue. diff --git a/test/installation_iojs/install from binary b/test/installation_iojs/install from binary index b20f50f..3ffe8aa 100755 --- a/test/installation_iojs/install from binary +++ b/test/installation_iojs/install from binary @@ -9,9 +9,13 @@ NVM_PREFIXED_TEST_VERSION="iojs-$NVM_TEST_VERSION" # Remove the stuff we're clobbering. [ -e "${NVM_DIR}/versions/io.js/${NVM_TEST_VERSION}" ] && rm -R "${NVM_DIR}/versions/io.js/${NVM_TEST_VERSION}" +[ -e "${NVM_DIR}/.cache/bin/${NVM_TEST_VERSION}-linux-x64/" ] && rm -R "${NVM_DIR}/.cache/bin/${NVM_TEST_VERSION}-linux-x64/" # Install from binary -nvm install $NVM_PREFIXED_TEST_VERSION || die "install $NVM_PREFIXED_TEST_VERSION failed" +OUTPUT_HEAD="$(2>&1 nvm install --no-progress $NVM_PREFIXED_TEST_VERSION | tac | tail -n 1)" || die "install $NVM_PREFIXED_TEST_VERSION failed" +EXPECTED_OUTPUT_HEAD="Downloading and installing io.js v1.0.0..." + +[ "${OUTPUT_HEAD}" = "${EXPECTED_OUTPUT_HEAD}" ] || die "expected >${EXPECTED_OUTPUT_HEAD}<; got >${OUTPUT_HEAD}<" # Check [ -d "${NVM_DIR}/versions/io.js/${NVM_TEST_VERSION}" ]