diff --git a/nvm.sh b/nvm.sh index 17d926e..6815dde 100644 --- a/nvm.sh +++ b/nvm.sh @@ -1581,6 +1581,11 @@ nvm_install_binary() { local TMPDIR local VERSION_PATH + local NODE_OR_IOJS + if [ "${FLAVOR}" = 'node' ]; then + NODE_OR_IOJS="${FLAVOR}" + fi + nvm_echo "Downloading and installing ${NODE_OR_IOJS-} ${VERSION}..." TARBALL="$(nvm_download_artifact "${FLAVOR}" binary "${TYPE-}" "${VERSION}" | command tail -1)" if [ -f "${TARBALL}" ]; then TMPDIR="$(dirname "${TARBALL}")/files" diff --git a/test/installation_node/install hook b/test/installation_node/install hook index e5a2440..61bd84a 100755 --- a/test/installation_node/install hook +++ b/test/installation_node/install hook @@ -22,6 +22,7 @@ fail() { OUTPUT="$(NVM_INSTALL_THIRD_PARTY_HOOK=succeed nvm install "${VERSION}")" USE_OUTPUT="$(nvm use "${VERSION}")" EXPECTED_OUTPUT="${VERSION} node std binary ${VERSION_PATH} +Downloading and installing node ${VERSION}... ${USE_OUTPUT} ${USE_OUTPUT}" # double use output is from the normal install in succeed() @@ -32,6 +33,7 @@ ${USE_OUTPUT}" # double use output is from the normal install in succeed() OUTPUT="$(NVM_INSTALL_THIRD_PARTY_HOOK=fail nvm install "${VERSION}" || echo 'failed')" USE_OUTPUT="$(nvm use "${VERSION}")" EXPECTED_OUTPUT="${VERSION} node std binary ${VERSION_PATH} +Downloading and installing node ${VERSION}... ${USE_OUTPUT} failed"