Skip to content

Commit

Permalink
[Fix] set -e: nvm install lts/something: call `nvm_ensure_default…
Browse files Browse the repository at this point in the history
…_set` with the proper value.

Fixes #1394.
  • Loading branch information
ljharb committed Feb 12, 2017
1 parent 1b23052 commit affcc50
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 5 additions & 1 deletion nvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2460,7 +2460,11 @@ nvm() {
fi

if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then
nvm_ensure_default_set "$provided_version"
if [ -n "${LTS-}" ]; then
nvm_ensure_default_set "lts/${LTS}"
else
nvm_ensure_default_set "$provided_version"
fi
if [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
&& [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
Expand Down
2 changes: 0 additions & 2 deletions test/installation_node/install LTS
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ EXPECTED_OUTPUT="Version '3' (with LTS filter 'argon') not found - try \`nvm ls-
[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts=argon 3\` did not exit with 3, got >${EXIT_CODE}<"
[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"

set +e # TODO: fix
nvm install --lts 4.2.2 || die 'nvm install --lts 4.2.2 failed'
set -e

[ "$(nvm current)" = "v4.2.2" ] || die "v4.2.2 not current, got $(nvm_current)"

0 comments on commit affcc50

Please sign in to comment.