Merge c74c74eb0a9f2a11015a00ce1551a290797b11dc into 4beab63631764fc381a0e56273faf8d43b8f9509

.github/workflows/nvm-install-test.yml

@@ -1,104 +0,0 @@
-name: 'Tests: nvm install with set -e'
-
-on:
-  pull_request:
-  push:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'git ref to use'
-        required: false
-        default: 'HEAD'
-
-jobs:
-  matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - id: matrix
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ -n "${{ github.event.inputs.ref }}" ]; then
-            echo "matrix=\"[\"${{ github.event.inputs.ref }}\"]\"" >> $GITHUB_OUTPUT
-          else
-            TAGS="$((echo "HEAD" && git tag --sort=-v:refname --merged HEAD --format='%(refname:strip=2) %(creatordate:short)' | grep '^v' | while read tag date; do
-              if [ "$(uname)" == "Darwin" ]; then
-                timestamp=$(date -j -f "%Y-%m-%d" "$date" +%s)
-                threshold=$(date -j -v-4y +%s)
-              else
-                timestamp=$(date -d "$date" +%s)
-                threshold=$(date -d "4 years ago" +%s)
-              fi
-              if [ $timestamp -ge $threshold ]; then echo "$tag"; fi
-            done) | xargs)"
-            echo $TAGS
-            TAGS_JSON=$(printf "%s\n" $TAGS | jq -R . | jq -sc .)
-            echo "matrix=${TAGS_JSON}" >> $GITHUB_OUTPUT
-          fi
-
-  test:
-    needs: [matrix]
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.ref == 'v0.40.0' }} # https://github.com/nvm-sh/nvm/issues/3405
-    strategy:
-      fail-fast: false
-      matrix:
-        ref: ${{ fromJson(needs.matrix.outputs.matrix) }}
-        has-nvmrc:
-          - 'no nvmrc'
-          - 'nvmrc'
-        shell-level:
-          - 1 shlvl
-          - 2 shlvls
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: resolve HEAD to sha
-        run: |
-          if [ '${{ matrix.ref }}' = 'HEAD' ]; then
-            REF="$(git rev-parse HEAD)"
-          else
-            REF="${{ matrix.ref }}"
-          fi
-          echo "resolved ref: ${REF}"
-          echo "ref="$REF"" >> $GITHUB_ENV
-      - run: echo $- # which options are set
-      - run: echo node > .nvmrc
-        if: ${{ matrix.has-nvmrc == 'nvmrc' }}
-      - run:  curl -I --compressed -v https://nodejs.org/dist/
-      - name: 'install nvm'
-        run: |
-          set -e
-          export NVM_INSTALL_VERSION="${ref}"
-          curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${ref}/install.sh" | bash
-      - name: nvm --version
-        run: |
-          set +e
-          . $NVM_DIR/nvm.sh && nvm --version
-      - name: nvm install in 1 shell level, ${{ matrix.has-nvmrc }}
-        if: ${{ matrix.shell-level == '1 shlvl' }}
-        run: |
-          set -ex
-          . $NVM_DIR/nvm.sh
-          echo nvm.sh sourced
-          nvm --version
-          if [ '${{ matrix.has-nvmrc }}' == 'nvmrc' ]; then
-            nvm install
-          fi
-      - name: nvm install in 2 shell levels, ${{ matrix.has-nvmrc }}
-        if: ${{ matrix.shell-level == '2 shlvls' }}
-        run: |
-          if [ '${{ matrix.has-nvmrc }}' == 'nvmrc' ]; then
-            bash -c "set -ex && . $NVM_DIR/nvm.sh && echo nvm.sh sourced && nvm --version && nvm install"
-          else
-            bash -c "set -ex && . $NVM_DIR/nvm.sh && echo nvm.sh sourced && nvm --version"
-          fi
-
-  finisher:
-    runs-on: ubuntu-latest
-    needs: [test]
-    steps:
-      - run: true

.github/workflows/tests.yml

@@ -19,24 +19,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        exclude:
+        include:
-          - shell: sh
+          - shell: bash
             suite: install_script
-          - shell: dash
+      #   shell:
-            suite: install_script
+      #     - bash
-          - shell: zsh
+      #   suite:
-            suite: install_script
+      #     - install_script
-          - shell: ksh
-            suite: install_script
-        suite:
-          - install_script
-          - sourcing
-        shell:
-          - sh
-          - bash
-          - dash
-          - zsh
-          # - ksh
 
     steps:
       - name: Harden Runner
@@ -48,13 +37,7 @@ jobs:
             raw.githubusercontent.com:443
             nodejs.org:443
             iojs.org:443
-            azure.archive.ubuntu.com:80
-            packages.microsoft.com:443
       - uses: actions/checkout@v4
-      - run: sudo apt-get update; sudo apt-get install ${{ matrix.shell }}
-        if: matrix.shell == 'zsh' || matrix.shell == 'ksh'
-        # zsh (https://github.com/actions/runner-images/issues/264) and ksh are not in the ubuntu image
-        shell: bash
       - run: sudo ${{ matrix.shell }} --version 2> /dev/null || dpkg -s ${{ matrix.shell }} 2> /dev/null || which ${{ matrix.shell }}
       - run: curl --version
       - run: wget --version
@@ -65,7 +48,6 @@ jobs:
           skip-ls-check: true
           shell-command: echo installed
       - run: npm ls urchin
-      - run: npx which urchin
       - run: env
       - run: make TERM=xterm-256color TEST_SUITE="${{ matrix.suite }}" SHELL="${{ matrix.shell }}" URCHIN="$(npx which urchin)" test-${{ matrix.shell }}
 

.travis.yml

@@ -87,6 +87,11 @@ env:
     - SHELL=bash TEST_SUITE=fast
     - SHELL=zsh TEST_SUITE=fast
     #  - SHELL=ksh TEST_SUITE=fast
+    - SHELL=sh TEST_SUITE=sourcing
+    - SHELL=dash TEST_SUITE=sourcing
+    - SHELL=bash TEST_SUITE=sourcing
+    - SHELL=zsh TEST_SUITE=sourcing
+    #  - SHELL=ksh TEST_SUITE=sourcing
     - SHELL=sh TEST_SUITE=slow
     - SHELL=dash TEST_SUITE=slow
     - SHELL=bash TEST_SUITE=slow

Makefile

@@ -43,7 +43,7 @@ $(SHELL_TARGETS):
 	@shell='$@'; shell=$${shell##*-}; \
 	which "$$shell" >/dev/null || { printf '\033[0;31m%s\033[0m\n' "WARNING: Cannot test with shell '$$shell': not found." >&2; exit 0; } && \
 	printf '\n\033[0;34m%s\033[0m\n' "Running tests in $$shell"; \
-	[ -z "$$TRAVIS_BUILD_DIR" ] && [ -z "$$GITHUB_ACTIONS" ] && for v in $$(set | awk -F'=' '$$1 ~ "^NVM_" { print $$1 }'); do unset $$v; done && unset v; \
+	[ -z "$$TRAVIS_BUILD_DIR" ] && for v in $$(set | awk -F'=' '$$1 ~ "^NVM_" { print $$1 }'); do unset $$v; done && unset v; \
 	for suite in $(TEST_SUITE); do \
 		echo "Running test suite: $$suite"; \
 		$(URCHIN) -f -s $$shell test/$$suite || exit; \

install.sh

@@ -358,7 +358,7 @@ nvm_check_global_modules() {
     command printf %s\\n "$NPM_GLOBAL_MODULES"
     nvm_echo '=> If you wish to uninstall them at a later point (or re-install them under your'
     # shellcheck disable=SC2016
-    nvm_echo '=> `nvm` node installs), you can remove them from the system Node as follows:'
+    nvm_echo '=> `nvm` Nodes), you can remove them from the system Node as follows:'
     nvm_echo
     nvm_echo '     $ nvm use system'
     nvm_echo '     $ npm uninstall -g a_module'

nvm.sh

@@ -81,7 +81,7 @@ nvm_command_info() {
 nvm_has_colors() {
   local NVM_NUM_COLORS
   if nvm_has tput; then
-    NVM_NUM_COLORS="$(command tput -T "${TERM:-vt100}" colors)"
+    NVM_NUM_COLORS="$(tput -T "${TERM:-vt100}" colors)"
   fi
   [ "${NVM_NUM_COLORS:--1}" -ge 8 ] && [ "${NVM_NO_COLORS-}" != '--no-colors' ]
 }
@@ -128,12 +128,7 @@ nvm_download() {
     if nvm_curl_use_compression; then
       CURL_COMPRESSED_FLAG="--compressed"
     fi
-    local NVM_DOWNLOAD_ARGS
+    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
-    NVM_DOWNLOAD_ARGS=''
-    for arg in "$@"; do
-      NVM_DOWNLOAD_ARGS="${NVM_DOWNLOAD_ARGS} \"$arg\""
-    done
-    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} ${NVM_DOWNLOAD_ARGS}"
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -3365,10 +3360,6 @@ nvm() {
             shift
           ;;
           --save | -w)
-            if [ $NVM_WRITE_TO_NVMRC -eq 1 ]; then
-              nvm_err '--save and -w may only be provided once'
-              return 6
-            fi
             NVM_WRITE_TO_NVMRC=1
             shift
           ;;
@@ -3520,11 +3511,6 @@ nvm() {
           nvm_ensure_default_set "${provided_version}"
         fi
 
-        if [ $NVM_WRITE_TO_NVMRC -eq 1 ]; then
-          nvm_write_nvmrc "${VERSION}"
-          EXIT_CODE=$?
-        fi
-
         if [ $EXIT_CODE -ne 0 ] && [ -n "${ALIAS-}" ]; then
           nvm alias "${ALIAS}" "${provided_version}"
           EXIT_CODE=$?
@@ -3760,8 +3746,6 @@ nvm() {
       local NVM_LTS
       local IS_VERSION_FROM_NVMRC
       IS_VERSION_FROM_NVMRC=0
-      local NVM_WRITE_TO_NVMRC
-      NVM_WRITE_TO_NVMRC=0
 
       while [ $# -ne 0 ]; do
         case "$1" in
@@ -3773,13 +3757,7 @@ nvm() {
           --) ;;
           --lts) NVM_LTS='*' ;;
           --lts=*) NVM_LTS="${1##--lts=}" ;;
-          --save | -w)
+          --save | -w) NVM_WRITE_TO_NVMRC=1 ;;
-            if [ $NVM_WRITE_TO_NVMRC -eq 1 ]; then
-              nvm_err '--save and -w may only be provided once'
-              return 6
-            fi
-            NVM_WRITE_TO_NVMRC=1
-          ;;
           --*) ;;
           *)
             if [ -n "${1-}" ]; then
@@ -3813,8 +3791,8 @@ nvm() {
         return 127
       fi
 
-      if [ $NVM_WRITE_TO_NVMRC -eq 1 ]; then
+      if [ "${NVM_WRITE_TO_NVMRC:-0}" -eq 1 ]; then
-        nvm_write_nvmrc "${VERSION}"
+        nvm_write_nvmrc "$VERSION"
       fi
 
       if [ "_${VERSION}" = '_system' ]; then
@@ -3832,7 +3810,7 @@ nvm() {
           nvm_err 'System version of node not found.'
         fi
         return 127
-      elif [ "_${VERSION}" = '_∞' ]; then
+      elif [ "_${VERSION}" = "_∞" ]; then
         if [ "${NVM_SILENT:-0}" -ne 1 ]; then
           nvm_err "The alias \"${PROVIDED_VERSION}\" leads to an infinite loop. Aborting."
         fi
@@ -4567,44 +4545,31 @@ nvm_supports_xz() {
 nvm_auto() {
   local NVM_MODE
   NVM_MODE="${1-}"
-
+  local VERSION
-  case "${NVM_MODE}" in
+  local NVM_CURRENT
-    none) return 0 ;;
+  if [ "_${NVM_MODE}" = '_install' ]; then
-    use)
+    VERSION="$(nvm_alias default 2>/dev/null || nvm_echo)"
-      local VERSION
+    if [ -n "${VERSION}" ] && ! [ "_${VERSION}" = '_N/A' ] && nvm_is_valid_version "${VERSION}"; then
-      local NVM_CURRENT
+      nvm install "${VERSION}" >/dev/null
-      NVM_CURRENT="$(nvm_ls_current)"
+    elif nvm_rc_version >/dev/null 2>&1; then
-      if [ "_${NVM_CURRENT}" = '_none' ] || [ "_${NVM_CURRENT}" = '_system' ]; then
+      nvm install >/dev/null
-        VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
+    fi
-        if [ -n "${VERSION}" ]; then
+  elif [ "_$NVM_MODE" = '_use' ]; then
-          if [ "_${VERSION}" != '_N/A' ] && nvm_is_valid_version "${VERSION}"; then
+    NVM_CURRENT="$(nvm_ls_current)"
-            nvm use --silent "${VERSION}" >/dev/null
+    if [ "_${NVM_CURRENT}" = '_none' ] || [ "_${NVM_CURRENT}" = '_system' ]; then
-          else
+      VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
-            return 0
+      if [ -n "${VERSION}" ] && ! [ "_${VERSION}" = '_N/A' ] && nvm_is_valid_version "${VERSION}"; then
-          fi
+        nvm use --silent "${VERSION}" >/dev/null
-        elif nvm_rc_version >/dev/null 2>&1; then
-          nvm use --silent >/dev/null
-        fi
-      else
-        nvm use --silent "${NVM_CURRENT}" >/dev/null
-      fi
-    ;;
-    install)
-      local VERSION
-      VERSION="$(nvm_alias default 2>/dev/null || nvm_echo)"
-      if [ -n "${VERSION}" ] && [ "_${VERSION}" != '_N/A' ] && nvm_is_valid_version "${VERSION}"; then
-        nvm install "${VERSION}" >/dev/null
       elif nvm_rc_version >/dev/null 2>&1; then
-        nvm install >/dev/null
+        nvm use --silent >/dev/null
-      else
-        return 0
       fi
-    ;;
+    else
-    *)
+      nvm use --silent "${NVM_CURRENT}" >/dev/null
-      nvm_err 'Invalid auto mode supplied.'
+    fi
-      return 1
+  elif [ "_${NVM_MODE}" != '_none' ]; then
-    ;;
+    nvm_err 'Invalid auto mode supplied.'
-  esac
+    return 1
+  fi
 }
 
 nvm_process_parameters() {

test/fast/Unit tests/nvm_download

@@ -25,7 +25,4 @@ NVM_AUTH_HEADER="Bearer test-token" nvm_download "http://127.0.0.1/bearer" > /de
 nvm_download "http://127.0.0.1/bearer" > /dev/null && die 'nvm_download with no auth header should not send the header and should fail'
 docker stop httpbin && docker rm httpbin
 
-# ensure quoted extra args remain quoted
-nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/install.sh" -o "; die quoted-command-not-quoted" || die 'command failed'
-
 cleanup

test/install_script/nvm_check_global_modules

@@ -27,15 +27,15 @@ setup () {
   mkdir -p "$npm_config_prefix/lib"
 }
 
+
 setup
 
 npm install -g nop >/dev/null || die 'nvm_check_global_modules cannot be tested because `npm` cannot install the `nop` package'
 message=$(nvm_check_global_modules)
 [ ! -z "$message" ] || die "nvm_check_global_modules should have printed a notice when npm had global modules installed; got:\n${message}"
 
-if [ -n "${ORIGINAL_NVM_DIR}" ] && [ -z "${GITHUB_ACTIONS}" ]; then
+if [ -n "${ORIGINAL_NVM_DIR}" ]; then
   # Admit we're using NVM, just for this one test
-  # TODO: fix this for GHA
   message=$(NVM_DIR="${ORIGINAL_NVM_DIR}" nvm_check_global_modules)
   [ -z "$message" ] || die "nvm_check_global_modules should not have printed a notice when npm is managed by nvm; got:\n${message}"
 fi

test/install_script/nvm_download

@@ -12,7 +12,7 @@ nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/install.sh" >/de
 
 # nvm_download should fail to download wrong_install.sh
 if nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/wrong_install.sh" &>/dev/null; then
-  die "nvm_download should fail to download nonexistent file"
+  die "nvm_download should fail to download no existing file"
 fi
 
 cleanup

test/sourcing/Sourcing nvm.sh should keep version if one is active

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-die () { echo "$*" ; echo "|${NVM_DIR}|"; exit 1; }
+die () { echo "$@" ; exit 1; }
 
 echo '0.10.1' > ../../alias/default || die "couldn't create default alias"
 
@@ -9,12 +9,12 @@ echo '0.10.1' > ../../alias/default || die "couldn't create default alias"
 NVM_TARGET=0.10.3
 NVM_DEFAULT="$(nvm_resolve_local_alias default)"
 
-[ "_${NVM_DEFAULT}" != "_${NVM_TARGET}" ] || die "default ${NVM_DEFAULT} is the same as target ${NVM_TARGET}"
+[ "_$NVM_DEFAULT" != "_$NVM_TARGET" ] || die "default $NVM_DEFAULT is the same as target $NVM_TARGET"
 
-nvm use "${NVM_TARGET}" || die "nvm use ${NVM_TARGET} failed"
+nvm use $NVM_TARGET || die "nvm use $NVM_TARGET failed"
 
 \. ../../nvm.sh || die 'sourcing returned nonzero exit code'
 
 NVM_CURRENT="$(nvm current)"
 
-[ "_${NVM_CURRENT#v}" = "_${NVM_TARGET}" ] || die "node version not retained after sourcing"
+[ "_${NVM_CURRENT#v}" = "_$NVM_TARGET" ] || die "node version not retained after sourcing"

test/sourcing/Sourcing nvm.sh should use the default if available and no nvm node is loaded

@@ -8,21 +8,21 @@ die () { echo "$@" ; exit 1; }
 # despite being unloaded in setup, the inherited PATH still contains
 # an nvm-installed node version. We have to reset NVM_DIR after the unload.
 \. ../../nvm.sh || die 'sourcing returned nonzero exit code'
-NVM_DIR_CACHED="${NVM_DIR}"
+NVM_DIR_CACHED="$NVM_DIR"
 nvm unload || die 'unloading returned nonzero exit code'
-NVM_DIR="${NVM_DIR_CACHED}"
+NVM_DIR="$NVM_DIR_CACHED"
 
-echo '0.10.1' > "${NVM_DIR}/alias/default" || die 'creation of default alias failed'
+echo '0.10.1' > ../../alias/default || die 'creation of default alias failed'
 
 # Now to begin the real test
 \. ../../nvm.sh || die 'sourcing returned nonzero exit code'
 
 NVM_LS_CURRENT_NOT_GREPPED="$(nvm ls current | strip_colors)"
 NVM_LS_CURRENT="$(nvm ls current | strip_colors | \grep -o v0.10.1)"
-[ "_${NVM_LS_CURRENT}" = '_v0.10.1' ] || die "'nvm ls current' did not return '-> v0.10.1', got '${NVM_LS_CURRENT_NOT_GREPPED}'"
+[ "_$NVM_LS_CURRENT" = '_v0.10.1' ] || die "'nvm ls current' did not return '-> v0.10.1', got '$NVM_LS_CURRENT_NOT_GREPPED'"
 
 # NVM_LS_CURRENT_COLORED="$(nvm ls current | sed -n l)"
 
 NVM_ALIAS_DEFAULT="$(nvm alias default | strip_colors)"
-[ "_${NVM_ALIAS_DEFAULT}" = "_default -> 0.10.1 (-> v0.10.1)" ] \
+[ "_$NVM_ALIAS_DEFAULT" = "_default -> 0.10.1 (-> v0.10.1)" ] \
-  || die "'nvm alias default did not return 'default -> 0.10.1 (-> v0.10.1)', got '${NVM_ALIAS_DEFAULT}'"
+  || die "'nvm alias default did not return 'default -> 0.10.1 (-> v0.10.1)', got '$NVM_ALIAS_DEFAULT'"

test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-die () { echo "$*" ; echo "|${NVM_DIR}|"; exit 1; }
+die () { echo "$@" ; exit 1; }
-
 supports_source_options () {
   [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
 }
@@ -11,23 +10,18 @@ if ! supports_source_options; then
   exit 0;
 fi
 
-echo '0.10.2' > .nvmrc || die 'creation of .nvmrc failed'
+echo '0.10.2' > ../../.nvmrc || die 'creation of .nvmrc failed'
-
-export NVM_DIR="${PWD}/../.."
-rm ../../alias/default
 
 \. ../../nvm.sh --install
-EXIT_CODE="$?"
+EXIT_CODE="$(echo $?)"
 
 echo 'sourcing complete.'
 
+nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: $(nvm ls)"
+
 [ "_$(nvm_rc_version | \grep -o -e 'with version .*$')" = "_with version <0.10.2>" ] || die "nvm_rc_version $(nvm_rc_version)"
 
-nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: \n$(nvm_ls)"
+[ "_$EXIT_CODE" = "_0" ] || die "sourcing returned nonzero exit code: $EXIT_CODE"
-
-[ "_${EXIT_CODE}" = '_0' ] || die "sourcing returned nonzero exit code: ${EXIT_CODE}"
 
 NVM_LS_CURRENT="$(nvm ls current | \grep -o v0.10.2)"
-[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got >${NVM_LS_CURRENT}<\n$(nvm_ls)"
+[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT' `nvm ls`"
-
-rm .nvmrc

test/sourcing/Sourcing nvm.sh with --install should install the default

@@ -2,7 +2,6 @@
 \. ../common.sh
 
 die () { echo "$@" ; exit 1; }
-
 supports_source_options () {
   [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
 }
@@ -12,26 +11,22 @@ if ! supports_source_options; then
   exit 0;
 fi
 
-rm .nvmrc
-export NVM_DIR="${PWD}/../.."
 echo '0.10.2' > ../../alias/default || die 'creation of default alias failed'
 
 echo 'sourcing nvm with --install...'
 
 \. ../../nvm.sh --install
-EXIT_CODE="$?"
+EXIT_CODE="$(echo $?)"
 
 echo 'sourcing complete.'
 
-[ "$(nvm_alias default)" = '0.10.2' ] || die "nvm_alias default did not return '0.10.2', got >$(nvm_alias default)<"
+nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: $(nvm ls)"
 
-nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: \n$(nvm_ls)"
+[ "_$EXIT_CODE" = "_0" ] || die "sourcing returned nonzero exit code: $EXIT_CODE"
-
-[ "_$EXIT_CODE" = '_0' ] || die "sourcing returned nonzero exit code: ${EXIT_CODE}"
 
 NVM_LS_CURRENT="$(nvm ls current | strip_colors | command grep -o v0.10.2)"
-[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', >${NVM_LS_CURRENT}<\n$(nvm_ls)"
+[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT'"
 
 NVM_ALIAS_DEFAULT="$(nvm alias default | strip_colors)"
 [ "_$NVM_ALIAS_DEFAULT" = "_default -> 0.10.2 (-> v0.10.2)" ] \
-  || die "'nvm alias default did not return 'default -> 0.10.2 (-> v0.10.2)', got >${NVM_ALIAS_DEFAULT}<\n$(nvm_ls)"
+  || die "'nvm alias default did not return 'default -> 0.10.2 (-> v0.10.2)', got '$NVM_ALIAS_DEFAULT'"

test/sourcing/teardown

@@ -4,5 +4,4 @@ rm -rf ../../alias
 rm -rf ../../v0.10.1
 rm -rf ../../v0.10.2
 rm -rf ../../v0.10.3
-rm -rf ../../versions/node/v4.1.0
 rm -f ../../.nvmrc