[Tests] ensure things that care about colors run in a terminal

2024-07-28 21:00:48 -07:00
41 changed files with 305 additions and 606 deletions
--- a/.github/workflows/nvm-install-test.yml
+++ b/.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
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,24 +19,13 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        exclude:
-          - shell: sh
+        include:
+          - shell: bash
            suite: install_script
-          - shell: dash
-            suite: install_script
-          - shell: zsh
-            suite: install_script
-          - shell: ksh
-            suite: install_script
-        suite:
-          - install_script
-          - sourcing
-        shell:
-          - sh
-          - bash
-          - dash
-          - zsh
-          # - ksh
+      #   shell:
+      #     - bash
+      #   suite:
+      #     - install_script

    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 }}

--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,3 @@ current
 npm-shrinkwrap.json
 package-lock.json
 yarn.lock
-
-target/
--- a/.travis.yml
+++ b/.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
--- a/2
+++ b/2
@@ -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; \
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 </a>


-# Node Version Manager [![Build Status](https://app.travis-ci.com/nvm-sh/nvm.svg?branch=master)][3] [![nvm version](https://img.shields.io/badge/version-v0.40.1-yellow.svg)][4] [![CII Best Practices](https://bestpractices.dev/projects/684/badge)](https://bestpractices.dev/projects/684)
+# Node Version Manager [![Build Status](https://app.travis-ci.com/nvm-sh/nvm.svg?branch=master)][3] [![nvm version](https://img.shields.io/badge/version-v0.39.7-yellow.svg)][4] [![CII Best Practices](https://bestpractices.dev/projects/684/badge)](https://bestpractices.dev/projects/684)

 <!-- To update this table of contents, ensure you have run `npm install` then `npm run doctoc` -->
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
@@ -61,8 +61,6 @@
 - [macOS Troubleshooting](#macos-troubleshooting)
 - [WSL Troubleshooting](#wsl-troubleshooting)
 - [Maintainers](#maintainers)
- [Project Support](#project-support)
- [Enterprise Support](#enterprise-support)
 - [License](#license)
 - [Copyright notice](#copyright-notice)

@@ -102,10 +100,10 @@ nvm is a version manager for [node.js](https://nodejs.org/en/), designed to be i

 To **install** or **update** nvm, you should run the [install script][2]. To do that, you may either download and run the script manually, or use the following cURL or Wget command:
 ```sh
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 ```
 ```sh
-wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 ```

 Running either of the above commands downloads a script and runs it. The script clones the nvm repository to `~/.nvm`, and attempts to add the source lines from the snippet below to the correct profile file (`~/.bash_profile`, `~/.zshrc`, `~/.profile`, or `~/.bashrc`).
@@ -127,7 +125,7 @@ Eg: `curl ... | NVM_DIR="path/to/nvm"`. Ensure that the `NVM_DIR` does not conta

 - The installer can use `git`, `curl`, or `wget` to download `nvm`, whichever is available.

- You can instruct the installer to not edit your shell config (for example if you already get completions via a [zsh nvm plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/nvm)) by setting `PROFILE=/dev/null` before running the `install.sh` script. Here's an example one-line command to do that: `PROFILE=/dev/null bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash'`
+- You can instruct the installer to not edit your shell config (for example if you already get completions via a [zsh nvm plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/nvm)) by setting `PROFILE=/dev/null` before running the `install.sh` script. Here's an example one-line command to do that: `PROFILE=/dev/null bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash'`

 #### Troubleshooting on Linux

@@ -175,7 +173,7 @@ You can use a task:
 ```yaml
 - name: Install nvm
  ansible.builtin.shell: >
-    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
  args:
    creates: "{{ ansible_env.HOME }}/.nvm/nvm.sh"
 ```
@@ -237,7 +235,7 @@ If you have `git` installed (requires git v1.7.10+):

 1. clone this repo in the root of your user profile
    - `cd ~/` from anywhere then `git clone https://github.com/nvm-sh/nvm.git .nvm`
-1. `cd ~/.nvm` and check out the latest version with `git checkout v0.40.1`
+1. `cd ~/.nvm` and check out the latest version with `git checkout v0.39.7`
 1. activate `nvm` by sourcing it from your shell: `. ./nvm.sh`

 Now add these lines to your `~/.bashrc`, `~/.profile`, or `~/.zshrc` file to have it automatically sourced upon login:
@@ -843,13 +841,13 @@ If installing nvm on Alpine Linux *is* still what you want or need to do, you sh
 ### Alpine Linux 3.13+
 ```sh
 apk add -U curl bash ca-certificates openssl ncurses coreutils python3 make gcc g++ libgcc linux-headers grep util-linux binutils findutils
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 ```

 ### Alpine Linux 3.5 - 3.12
 ```sh
 apk add -U curl bash ca-certificates openssl ncurses coreutils python2 make gcc g++ libgcc linux-headers grep util-linux binutils findutils
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 ```

 _Note: Alpine 3.5 can only install NodeJS versions up to v6.9.5, Alpine 3.6 can only install versions up to v6.10.3, Alpine 3.7 installs versions up to v8.9.3, Alpine 3.8 installs versions up to v8.14.0, Alpine 3.9 installs versions up to v10.19.0, Alpine 3.10 installs versions up to v10.24.1, Alpine 3.11 installs versions up to v12.22.6, Alpine 3.12 installs versions up to v12.22.12, Alpine 3.13 & 3.14 install versions up to v14.20.0, Alpine 3.15 & 3.16 install versions up to v16.16.0 (**These are all versions on the main branch**). Alpine 3.5 - 3.12 required the package `python2` to build NodeJS, as they are older versions to build. Alpine 3.13+ requires `python3` to successfully build newer NodeJS versions, but you can use `python2` with Alpine 3.13+ if you need to build versions of node supported in Alpine 3.5 - 3.15, you just need to specify what version of NodeJS you need to install in the package install script._
@@ -952,9 +950,9 @@ You have to make sure that the user directory name in `$HOME` and the user direc
 To change the user directory and/or account name follow the instructions [here](https://support.apple.com/en-us/HT201548)

 [1]: https://github.com/nvm-sh/nvm.git
-[2]: https://github.com/nvm-sh/nvm/blob/v0.40.1/install.sh
+[2]: https://github.com/nvm-sh/nvm/blob/v0.39.7/install.sh
 [3]: https://app.travis-ci.com/nvm-sh/nvm
-[4]: https://github.com/nvm-sh/nvm/releases/tag/v0.40.1
+[4]: https://github.com/nvm-sh/nvm/releases/tag/v0.39.7
 [Urchin]: https://git.sdf.org/tlevine/urchin
 [Fish]: https://fishshell.com

@@ -1012,7 +1010,7 @@ Here's what you will need to do:
  If one of these broken versions is installed on your system, the above step will likely still succeed even if you didn't include the `--shared-zlib` flag.
  However, later, when you attempt to `npm install` something using your old version of node.js, you will see `incorrect data check` errors.
  If you want to avoid the possible hassle of dealing with this, include that flag.
-  For more details, see [this issue](https://github.com/nodejs/node/issues/39313) and [this comment](https://github.com/nodejs/node/issues/39313#issuecomment-90.40.176)
+  For more details, see [this issue](https://github.com/nodejs/node/issues/39313) and [this comment](https://github.com/nodejs/node/issues/39313#issuecomment-90.39.776)

 - Exit back to your native shell.

@@ -1039,7 +1037,7 @@ Now you should be able to use node as usual.
 If you've encountered this error on WSL-2:

  ```sh
-  curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+  curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                  Dload  Upload  Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:--  0:00:09 --:--:--     0curl: (6) Could not resolve host: raw.githubusercontent.com
@@ -1072,16 +1070,6 @@ You can check the contents of the file by running:

 Currently, the sole maintainer is [@ljharb](https://github.com/ljharb) - more maintainers are quite welcome, and we hope to add folks to the team over time. [Governance](./GOVERNANCE.md) will be re-evaluated as the project evolves.

-## Project Support
-
-Only the latest version (v0.40.1 at this time) is supported.
-
-## Enterprise Support
-
-If you are unable to update to the latest version of `nvm`, our [partners](https://openjsf.org/ecosystem-sustainability-program) provide commercial security fixes for all unsupported versions:
-
-  - [HeroDevs Never-Ending Support](https://www.herodevs.com/support?utm_source=OpenJS&utm_medium=Link&utm_campaign=nvm_openjs)
-
 ## License

 See [LICENSE.md](./LICENSE.md).
--- a/install.sh
+++ b/install.sh
@@ -33,7 +33,7 @@ nvm_install_dir() {
 }

 nvm_latest_version() {
-  nvm_echo "v0.40.1"
+  nvm_echo "v0.39.7"
 }

 nvm_profile_is_bash_or_zsh() {
@@ -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'
--- a/nvm.sh
+++ b/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
-    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}"
+    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} $*"
  elif nvm_has "wget"; then
    # Emulate curl with wget
    ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -508,9 +503,9 @@ $(nvm_wrap_with_color_code 'y' "${warn_text}")"
 }

 nvm_process_nvmrc() {
-  local NVMRC_PATH
-  NVMRC_PATH="$1"
+  local NVMRC_PATH="$1"
  local lines
+  local unpaired_line

  lines=$(command sed 's/#.*//' "$NVMRC_PATH" | command sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | nvm_grep -v '^$')

@@ -520,12 +515,8 @@ nvm_process_nvmrc() {
  fi

  # Initialize key-value storage
-  local keys
-  keys=''
-  local values
-  values=''
-  local unpaired_line
-  unpaired_line=''
+  local keys=''
+  local values=''

  while IFS= read -r line; do
    if [ -z "${line}" ]; then
@@ -2199,7 +2190,7 @@ nvm_install_binary_extract() {
  command mkdir -p "${VERSION_PATH}" || return 1

  if [ "${NVM_OS}" = 'win' ]; then
-    command mv "${TMPDIR}/"*/* "${VERSION_PATH}/" || return 1
+    command mv "${TMPDIR}/"*/* "${VERSION_PATH}" || return 1
    command chmod +x "${VERSION_PATH}"/node.exe || return 1
    command chmod +x "${VERSION_PATH}"/npm || return 1
    command chmod +x "${VERSION_PATH}"/npx 2>/dev/null
@@ -2446,7 +2437,7 @@ nvm_download_artifact() {
  nvm_err "Downloading ${TARBALL_URL}..."
  nvm_download -L -C - "${PROGRESS_BAR}" "${TARBALL_URL}" -o "${TARBALL}" || (
    command rm -rf "${TARBALL}" "${tmpdir}"
-    nvm_err "download from ${TARBALL_URL} failed"
+    nvm_err "Binary download from ${TARBALL_URL} failed, trying source."
    return 4
  )

@@ -2922,11 +2913,11 @@ nvm_is_natural_num() {

 nvm_write_nvmrc() {
  local VERSION_STRING
-  VERSION_STRING=$(nvm_version "${1-}")
-  if [ "${VERSION_STRING}" = '∞' ] || [ "${VERSION_STRING}" = 'N/A' ]; then
+  VERSION_STRING=$(nvm_version "${1-$VERSION_STRING}")
+  if [ "$VERSION_STRING" = '∞' ] || [ "$VERSION_STRING" = 'N/A' ]; then
    return 1
  fi
-  echo "${VERSION_STRING}" | tee "$PWD"/.nvmrc > /dev/null || {
+  echo "$VERSION_STRING" | tee "$PWD"/.nvmrc > /dev/null || {
    if [ "${NVM_SILENT:-0}" -ne 1 ]; then
      nvm_err "Warning: Unable to write version number ($VERSION_STRING) to .nvmrc"
    fi
@@ -3365,10 +3356,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 +3507,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=$?
@@ -3576,13 +3558,9 @@ nvm() {
          EXIT_CODE=$?
        else
          EXIT_CODE=-1
-          if [ $nosource -eq 1 ]; then
-            nvm_err "Binary download is not available for ${VERSION}"
-            EXIT_CODE=3
-          fi
        fi

-        if [ $EXIT_CODE -ne 0 ] && [ $nosource -ne 1 ]; then
+        if [ $EXIT_CODE -ne 0 ]; then
          if [ -z "${NVM_MAKE_JOBS-}" ]; then
            nvm_get_make_jobs
          fi
@@ -3597,8 +3575,7 @@ nvm() {
        fi
      fi

-      if [ $EXIT_CODE -eq 0 ]; then
-        if nvm_use_if_needed "${VERSION}" && nvm_install_npm_if_needed "${VERSION}"; then
+      if [ $EXIT_CODE -eq 0 ] && nvm_use_if_needed "${VERSION}" && nvm_install_npm_if_needed "${VERSION}"; then
        if [ -n "${LTS-}" ]; then
          nvm_ensure_default_set "lts/${LTS}"
        else
@@ -3618,7 +3595,6 @@ nvm() {
      else
        EXIT_CODE=$?
      fi
-      fi

      return $EXIT_CODE
    ;;
@@ -3760,8 +3736,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 +3747,7 @@ nvm() {
          --) ;;
          --lts) NVM_LTS='*' ;;
          --lts=*) NVM_LTS="${1##--lts=}" ;;
-          --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
-          ;;
+          --save | -w) NVM_WRITE_TO_NVMRC=1 ;;
          --*) ;;
          *)
            if [ -n "${1-}" ]; then
@@ -3813,8 +3781,8 @@ nvm() {
        return 127
      fi

-      if [ $NVM_WRITE_TO_NVMRC -eq 1 ]; then
-        nvm_write_nvmrc "${VERSION}"
+      if [ "${NVM_WRITE_TO_NVMRC:-0}" -eq 1 ]; then
+        nvm_write_nvmrc "$VERSION"
      fi

      if [ "_${VERSION}" = '_system' ]; then
@@ -3832,7 +3800,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
@@ -4396,7 +4364,7 @@ nvm() {
      NVM_VERSION_ONLY=true NVM_LTS="${NVM_LTS-}" nvm_remote_version "${PATTERN:-node}"
    ;;
    "--version" | "-v")
-      nvm_echo '0.40.1'
+      nvm_echo '0.39.7'
    ;;
    "unload")
      nvm deactivate >/dev/null 2>&1
@@ -4561,44 +4529,31 @@ nvm_supports_xz() {
 nvm_auto() {
  local NVM_MODE
  NVM_MODE="${1-}"
-
-  case "${NVM_MODE}" in
-    none) return 0 ;;
-    use)
  local VERSION
  local NVM_CURRENT
+  if [ "_${NVM_MODE}" = '_install' ]; then
+    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
+    fi
+  elif [ "_$NVM_MODE" = '_use' ]; then
    NVM_CURRENT="$(nvm_ls_current)"
    if [ "_${NVM_CURRENT}" = '_none' ] || [ "_${NVM_CURRENT}" = '_system' ]; then
      VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
-        if [ -n "${VERSION}" ]; then
-          if [ "_${VERSION}" != '_N/A' ] && nvm_is_valid_version "${VERSION}"; then
+      if [ -n "${VERSION}" ] && ! [ "_${VERSION}" = '_N/A' ] && nvm_is_valid_version "${VERSION}"; then
        nvm use --silent "${VERSION}" >/dev/null
-          else
-            return 0
-          fi
      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
-      else
-        return 0
-      fi
-    ;;
-    *)
+  elif [ "_${NVM_MODE}" != '_none' ]; then
    nvm_err 'Invalid auto mode supplied.'
    return 1
-    ;;
-  esac
+  fi
 }

 nvm_process_parameters() {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "nvm",
-  "version": "0.40.1",
+  "version": "0.39.7",
  "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
  "directories": {
    "test": "test"
@@ -14,8 +14,6 @@
    "test/installation/node": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=installation_node test-$shell",
    "test/installation/iojs": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=installation_iojs test-$shell",
    "test/sourcing": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=sourcing test-$shell",
-    "test:check-exec": "(IFS=$'\\n'; for file in $(git ls-files test); do if [ ! -x \"$file\" ] && [[ \"$file\" != *.* ]] && [[ \"$file\" != test/fixtures/* ]]; then echo \"$file\"; fi; done) | tee /dev/stderr | awk 'END {if (NR > 0) exit 1}'",
-    "test:check-nonexec": "(IFS=$'\\n'; for file in $(git ls-files test); do if [ -x \"$file\" ] && [ ! -d \"$file\" ] && { [[ \"$file\" =~ '\\.(json|txt|sh|js|log)$' ]] || [[ \"$file\" =~ '^test/(mocks|fixtures)/.*' ]]; }; then echo \"$file\"; fi; done) | tee /dev/stderr | awk 'END {if (NR > 0) exit 1}'",
    "doctoc": "doctoc --title='## Table of Contents' --github README.md",
    "predoctoc:check": "cp README.md v-README.md.orig && npm run doctoc",
    "doctoc:check": "diff -q README.md v-README.md.orig",
@@ -47,7 +45,7 @@
    "eclint": "^2.8.1",
    "markdown-link-check": "^3.12.2",
    "replace": "^1.2.2",
-    "semver": "^7.6.3",
+    "semver": "^7.6.2",
    "urchin": "^0.0.5"
  }
 }
--- a/test/common.sh
+++ b/test/common.sh
@@ -245,3 +245,8 @@ _json_parse() {
 nvm_json_extract() {
  nvm_json_tokenize | _json_parse | grep -e "${1}" | awk '{print $2 $3}'
 }
+
+# ensures that commands are run as if in a terminal
+run_in_terminal() {
+  script -q -a /dev/null sh -c "\. ../nvm.sh ; $*"
+}
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -5,20 +5,20 @@

 die () { echo "$@" ; exit 1; }

-if [ -n "$ZSH_VERSION" ]; then
+if [ -n "${ZSH_VERSION}" ]; then
  # set clobber option in order to test that this does not produce any
  # incompatibilities
  setopt noclobber
 fi

-nvm alias test-stable-1 0.0.2 || die '`nvm alias test-stable-1 0.0.2` failed'
+nvm alias test-stable-1 0.0.2 || die "\`nvm alias test-stable-1 0.0.2\` failed"

-OUTPUT="$(nvm alias test-stable-1 | strip_colors)"
+OUTPUT="$(run_in_terminal nvm alias test-stable-1 | strip_colors)"
 EXPECTED_OUTPUT='test-stable-1 -> 0.0.2 (-> v0.0.2)'
-echo "$OUTPUT" | \grep -F "$EXPECTED_OUTPUT" || die "nvm alias test-stable-1 0.0.2 did not set test-stable-1 to 0.0.2: got '$OUTPUT'"
+echo "${OUTPUT}" | \grep -F "${EXPECTED_OUTPUT}" || die "nvm alias test-stable-1 0.0.2 did not set test-stable-1 to 0.0.2: got '${OUTPUT}'"

-nvm alias test-stable-1 0.0.1 || die '`nvm alias test-stable-1 0.0.1` failed'
+nvm alias test-stable-1 0.0.1 || die "\`nvm alias test-stable-1 0.0.1\` failed"

-OUTPUT="$(nvm alias test-stable-1 | strip_colors)"
+OUTPUT="$(run_in_terminal nvm alias test-stable-1 | strip_colors)"
 EXPECTED_OUTPUT='test-stable-1 -> 0.0.1 (-> v0.0.1)'
-echo "$OUTPUT" | \grep -F "$EXPECTED_OUTPUT" || die "nvm alias test-stable-1 0.0.1 did not set test-stable-1 to 0.0.1: got '$OUTPUT'"
+echo "$OUTPUT" | \grep -F "${EXPECTED_OUTPUT}" || die "nvm alias test-stable-1 0.0.1 did not set test-stable-1 to 0.0.1: got '${OUTPUT}'"
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -5,7 +5,7 @@

 die () { echo "$@" ; exit 1; }

-NVM_ALIAS_OUTPUT=$(nvm alias | strip_colors)
+NVM_ALIAS_OUTPUT=$(run_in_terminal nvm alias | strip_colors)

 EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
 STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -19,31 +19,31 @@ make_fake_node v0.9.1
 make_fake_iojs v0.2.1

 EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
-STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
+STABLE_VERSION="$(nvm_version "${EXPECTED_STABLE}")"

 EXPECTED_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
-UNSTABLE_VERSION="$(nvm_version "$EXPECTED_UNSTABLE")"
+UNSTABLE_VERSION="$(nvm_version "${EXPECTED_UNSTABLE}")"

-[ "_$STABLE_VERSION" != "_$UNSTABLE_VERSION" ] \
+[ "_${STABLE_VERSION}" != "_${UNSTABLE_VERSION}" ] \
  || die "stable and unstable versions are the same!"

-nvm alias stable "$EXPECTED_UNSTABLE"
-nvm alias unstable "$EXPECTED_STABLE"
+nvm alias stable "${EXPECTED_UNSTABLE}"
+nvm alias unstable "${EXPECTED_STABLE}"
 nvm alias node stable
 nvm alias iojs unstable

-NVM_ALIAS_OUTPUT=$(nvm alias | strip_colors)
+NVM_ALIAS_OUTPUT=$(run_in_terminal nvm alias | strip_colors)

-echo "$NVM_ALIAS_OUTPUT" | command grep -F "stable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION)" \
-  || die "nvm alias did not contain the overridden 'stable' alias; got '$NVM_ALIAS_OUTPUT'"
+echo "${NVM_ALIAS_OUTPUT}" | command grep -F "stable -> ${EXPECTED_UNSTABLE} (-> ${UNSTABLE_VERSION})" \
+  || die "nvm alias did not contain the overridden 'stable' alias; got '${NVM_ALIAS_OUTPUT}'"

-echo "$NVM_ALIAS_OUTPUT" | command grep -F "unstable -> $EXPECTED_STABLE (-> $STABLE_VERSION)" \
-  || die "nvm alias did not contain the overridden 'unstable' alias; got '$NVM_ALIAS_OUTPUT'"
+echo "${NVM_ALIAS_OUTPUT}" | command grep -F "unstable -> ${EXPECTED_STABLE} (-> ${STABLE_VERSION})" \
+  || die "nvm alias did not contain the overridden 'unstable' alias; got '${NVM_ALIAS_OUTPUT}'"

-echo "$NVM_ALIAS_OUTPUT" | command grep -F "node -> stable (-> $UNSTABLE_VERSION)" \
-  || die "nvm alias did not contain the overridden 'node' alias; got '$NVM_ALIAS_OUTPUT'"
+echo "${NVM_ALIAS_OUTPUT}" | command grep -F "node -> stable (-> ${UNSTABLE_VERSION})" \
+  || die "nvm alias did not contain the overridden 'node' alias; got '${NVM_ALIAS_OUTPUT}'"

-echo "$NVM_ALIAS_OUTPUT" | command grep -F "iojs -> unstable (-> $STABLE_VERSION)" \
-  || die "nvm alias did not contain the overridden 'iojs' alias; got '$NVM_ALIAS_OUTPUT'"
+echo "${NVM_ALIAS_OUTPUT}" | command grep -F "iojs -> unstable (-> ${STABLE_VERSION})" \
+  || die "nvm alias did not contain the overridden 'iojs' alias; got '${NVM_ALIAS_OUTPUT}'"

 cleanup
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -5,7 +5,7 @@

 die () { echo "$@" ; exit 1; }

-NVM_ALIAS_OUTPUT="$(nvm alias | strip_colors)"
+NVM_ALIAS_OUTPUT="$(run_in_terminal nvm alias | strip_colors)"
 echo "$NVM_ALIAS_OUTPUT" | \grep -F 'test-stable-1 -> 0.0.1 (-> v0.0.1)' \
  || die "did not find test-stable-1 alias; got '$NVM_ALIAS_OUTPUT'"
 echo "$NVM_ALIAS_OUTPUT" | \grep -F 'test-stable-2 -> 0.0.2 (-> v0.0.2)' \
--- a/test/fast/Aliases/nvm_ensure_default_set
+++ b/test/fast/Aliases/nvm_ensure_default_set
@@ -12,9 +12,9 @@ nvm_ensure_default_set 0.3 || die "'nvm_ensure_default_set' with an existing def

 nvm unalias default || die "'nvm unalias default' failed"

-OUTPUT="$(nvm_ensure_default_set 0.2)"
+OUTPUT="$(run_in_terminal nvm_ensure_default_set 0.2)"
 EXPECTED_OUTPUT="Creating default alias: default -> 0.2 (-> iojs-v0.2.10)"
 EXIT_CODE="$?"

-[ "_$(echo "$OUTPUT" | strip_colors)" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set 0.2' did not output '$EXPECTED_OUTPUT', got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_0" ] || die "'nvm_ensure_default_set 0.2' did not exit with 0, got $EXIT_CODE"
+[ "_$(echo "${OUTPUT}" | strip_colors)" = "_${EXPECTED_OUTPUT}" ] || die "'nvm_ensure_default_set 0.2' did not output '${EXPECTED_OUTPUT}', got '${OUTPUT}'"
+[ "_${EXIT_CODE}" = "_0" ] || die "'nvm_ensure_default_set 0.2' did not exit with 0, got ${EXIT_CODE}"
--- a/test/fast/Unit
+++ b/test/fast/Unit
@@ -4,7 +4,7 @@

 set -e

-TEST_VERSION='v0.2.4'
+TEST_VERSION="v0.2.4"

 if [ -f .nvmrc ]; then mv .nvmrc .nvmrc.orig; fi

@@ -12,7 +12,7 @@ cleanup() {
  nvm cache clear
  nvm deactivate
  nvm unalias default
-  rm -rf "${NVM_DIR}/v0.2.4" .nvmrc
+  rm -rf ${NVM_DIR}/v* .nvmrc
  if [ -f .nvmrc.orig ]; then mv .nvmrc.orig .nvmrc; fi
  unset -f nvm_ls_remote nvm_ls_remote_iojs
 }
@@ -23,39 +23,21 @@ die() {
  exit 1
 }

-REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
+REMOTE="$PWD/mocks/nvm_ls_remote.txt"
 nvm_ls_remote() {
-  if [ -n "${PATTERN}" ]; then
-    cat "${REMOTE}" | \grep "${PATTERN}"
-  else
-    cat "${REMOTE}"
-  fi
+  cat "$REMOTE"
 }
 REMOTE_IOJS="$PWD/mocks/nvm_ls_remote_iojs.txt"
 nvm_ls_remote_iojs() {
-  local PATTERN
-  PATTERN="${1-}"
-  if [ -n "${PATTERN}" ]; then
-    cat "${REMOTE_IOJS}" | \grep "${PATTERN}"
-  else
-    cat "${REMOTE_IOJS}"
-  fi
+  cat "$REMOTE_IOJS"
 }

-make_fake_node "${TEST_VERSION}"
+make_fake_node "$TEST_VERSION"

-nvm install -w "${TEST_VERSION}" || die "\`nvm install -w ${TEST_VERSION}\` failed"
+nvm install --save "$TEST_VERSION" || die "\`nvm install --save $TEST_VERSION\` failed"
 OUTPUT="$(cat .nvmrc)"

-nvm_is_valid_version "${OUTPUT}" \
-  || die "\`nvm install -w ${TEST_VERSION}\`+ \`cat .nvmrc\` outputted invalid version: got '${OUTPUT}'"
-
-rm .nvmrc || die 'removing of .nvmrc failed'
-
-nvm install --save "${TEST_VERSION}" || die "\`nvm install --save ${TEST_VERSION}\` failed"
-OUTPUT="$(cat .nvmrc)"
-
-nvm_is_valid_version "${OUTPUT}" \
-  || die "\`nvm install --save ${TEST_VERSION}\`+ \`cat .nvmrc\` outputted invalid version: got '${OUTPUT}'"
+nvm_is_valid_version "$(cat .nvmrc)" \
+  || die "\`nvm install --save $TEST_VERSION\`+ \`cat .nvmrc\` outputted invalid version: got '${OUTPUT}'"

 cleanup
--- a/test/fast/Unit
+++ b/test/fast/Unit
@@ -1,61 +0,0 @@
-#!/bin/sh
-\. ../../../nvm.sh
-\. ../../common.sh
-
-set -e
-
-TEST_VERSION='v0.2.4'
-
-if [ -f .nvmrc ]; then mv .nvmrc .nvmrc.orig; fi
-
-cleanup() {
-  nvm cache clear
-  nvm deactivate
-  nvm unalias default
-  rm -rf "${NVM_DIR}/v0.2.4" .nvmrc
-  if [ -f .nvmrc.orig ]; then mv .nvmrc.orig .nvmrc; fi
-  unset -f nvm_ls_remote nvm_ls_remote_iojs
-}
-
-die() {
-  echo "$@"
-  cleanup
-  exit 1
-}
-
-REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
-nvm_ls_remote() {
-  if [ -n "${PATTERN}" ]; then
-    cat "${REMOTE}" | \grep "${PATTERN}"
-  else
-    cat "${REMOTE}"
-  fi
-}
-REMOTE_IOJS="$PWD/mocks/nvm_ls_remote_iojs.txt"
-nvm_ls_remote_iojs() {
-  local PATTERN
-  PATTERN="${1-}"
-  if [ -n "${PATTERN}" ]; then
-    cat "${REMOTE_IOJS}" | \grep "${PATTERN}"
-  else
-    cat "${REMOTE_IOJS}"
-  fi
-}
-
-make_fake_node "${TEST_VERSION}"
-
-nvm use -w "${TEST_VERSION}" || die "\`nvm install -w ${TEST_VERSION}\` failed"
-OUTPUT="$(cat .nvmrc)"
-
-nvm_is_valid_version "${OUTPUT}" \
-  || die "\`nvm install -w ${TEST_VERSION}\`+ \`cat .nvmrc\` outputted invalid version: got '${OUTPUT}'"
-
-rm .nvmrc || die 'removing of .nvmrc failed'
-
-nvm use --save "${TEST_VERSION}" || die "\`nvm install --save ${TEST_VERSION}\` failed"
-OUTPUT="$(cat .nvmrc)"
-
-nvm_is_valid_version "${OUTPUT}" \
-  || die "\`nvm install --save ${TEST_VERSION}\`+ \`cat .nvmrc\` outputted invalid version: got '${OUTPUT}'"
-
-cleanup
--- a/test/fast/Unit
+++ b/test/fast/Unit
--- a/test/fast/Unit
+++ b/test/fast/Unit
@@ -12,7 +12,7 @@ cleanup () {
  nvm cache clear
  nvm deactivate
  nvm unalias default
-  rm -rf "${NVM_DIR}/${TEST_VERSION:?}" .nvmrc
+  rm -rf ${NVM_DIR}/v* .nvmrc
  if [ -f .nvmrc.orig ]; then mv .nvmrc.orig .nvmrc; fi
  unset -f nvm_ls_remote nvm_ls_remote_iojs
 }
@@ -23,29 +23,21 @@ die () {
  exit 1
 }

-REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
+REMOTE="$PWD/mocks/nvm_ls_remote.txt"
 nvm_ls_remote() {
-  cat "${REMOTE}"
+  cat "$REMOTE"
 }
-REMOTE_IOJS="${PWD}/mocks/nvm_ls_remote_iojs.txt"
+REMOTE_IOJS="$PWD/mocks/nvm_ls_remote_iojs.txt"
 nvm_ls_remote_iojs() {
-  cat "${REMOTE_IOJS}"
+  cat "$REMOTE_IOJS"
 }

-make_fake_node "${TEST_VERSION}"
+make_fake_node "$TEST_VERSION"

-OUTPUT=$(nvm use --save --silent "${TEST_VERSION}" || die "\`nvm use --save --silent ${TEST_VERSION}\` failed")
-EXPECTED_OUTPUT=''
+OUTPUT=$(nvm use --save --silent "$TEST_VERSION" || die "\`nvm use --save --silent $TEST_VERSION\` failed")
+EXPECTED_OUTPUT=""

-[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] \
-  || die "\`nvm use --save --silent ${TEST_VERSION}\` output was not silenced to '${EXPECTED_OUTPUT}'; got '${OUTPUT}'"
-
-rm .nvmrc || die 'removing of .nvmrc failed'
-
-OUTPUT=$(nvm use -w --silent "${TEST_VERSION}" || die "\`nvm use -w --silent ${TEST_VERSION}\` failed")
-EXPECTED_OUTPUT=''
-
-[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] \
-  || die "\`nvm use -w --silent ${TEST_VERSION}\` output was not silenced to '${EXPECTED_OUTPUT}'; got '${OUTPUT}'"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
+  || die "\`nvm use --save --silent $TEST_VERSION\` output was not silenced to '$EXPECTED_OUTPUT'; got '$OUTPUT'"

 cleanup
--- a/test/fast/Unit
+++ b/test/fast/Unit
@@ -0,0 +1,62 @@
+#!/bin/sh
+\. ../../../nvm.sh
+
+set -e
+
+if [ -f .nvmrc ]; then mv .nvmrc .nvmrc.orig; fi
+
+TEST_VERSION="v0.2.4"
+
+cleanup () {
+  nvm cache clear
+  nvm deactivate
+  nvm unalias default
+  rm -rf ${NVM_DIR}/v* .nvmrc
+  if [ -f .nvmrc.orig ]; then mv .nvmrc.orig .nvmrc; fi
+  unset -f nvm_ls_remote nvm_ls_remote_iojs
+}
+
+die () {
+  echo "$@"
+  cleanup
+  exit 1
+}
+
+nvm deactivate 2>/dev/null || die 'unable to deactivate'
+
+\. ../../common.sh
+
+REMOTE="$PWD/mocks/nvm_ls_remote.txt"
+nvm_ls_remote() {
+  cat "$REMOTE"
+}
+REMOTE_IOJS="$PWD/mocks/nvm_ls_remote_iojs.txt"
+nvm_ls_remote_iojs() {
+  cat "$REMOTE_IOJS"
+}
+
+make_fake_node "$TEST_VERSION"
+
+# 1. install
+
+nvm install -w "$TEST_VERSION" || die "\`nvm install -w $TEST_VERSION\` failed"
+OUTPUT="$(cat .nvmrc)"
+
+nvm_is_valid_version "$(cat .nvmrc)" \
+  || die "\`nvm install -w $TEST_VERSION\`+ \`cat .nvmrc\` outputted invalid version: got '${OUTPUT}'"
+
+#
+
+unset OUTPUT
+
+# 2. use
+
+nvm use -w "$TEST_VERSION" || die "\`nvm use -w $TEST_VERSION\` failed"
+OUTPUT="$(cat .nvmrc)"
+
+nvm_is_valid_version "$(cat .nvmrc)" \
+  || die "\`nvm use -w $TEST_VERSION\`+ \`cat .nvmrc\` outputted invalid version: got '${OUTPUT}'"
+
+#
+
+cleanup
--- a/test/fast/Unit
+++ b/test/fast/Unit
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-die () { echo "$@" ; exit 1; }
-
-\. ../../../nvm.sh
-
-nvm_install_source() {
-  exit 42
-}
-
-VERSION="0.7.0"
-
-EXIT_CODE=$(nvm install -b "${VERSION}" ; echo $?)
-
-[ $EXIT_CODE -eq 3 ] || die "Expected exit code 3, got ${EXIT_CODE}"
-
-ACTUAL="$(nvm install -b "${VERSION}" 2>&1)"
-EXPECTED="Binary download is not available for v${VERSION}"
-
-[ "${ACTUAL}" = "${EXPECTED}" ] || die "Expected >${EXPECTED}<, got >${ACTUAL}<"
--- a/test/fast/Unit
+++ b/test/fast/Unit
@@ -6,52 +6,54 @@ die () { echo "$@" ; cleanup ; exit 1; }

 cleanup() {
  unset -f nvm_download nvm_ls_remote nvm_ls_remote_iojs
-  if [ -n "${TEMP_NVM_COLORS-}" ]; then
-    export NVM_COLORS=TEMP_NVM_COLORS
+  if [ -n "${TEMP_NVM_COLORS}" ]; then
+    export NVM_COLORS="${TEMP_NVM_COLORS}"
  fi
  unset TEMP_NVM_COLORS
 }

 \. ../../../nvm.sh
-if [ -n "${NVM_COLORS-}" ]; then
-  export TEMP_NVM_COLORS=NVM_COLORS
+
+if [ -n "${NVM_COLORS}" ]; then
+  export TEMP_NVM_COLORS="${NVM_COLORS}"
  unset NVM_COLORS
 fi

-nvm deactivate 2>/dev/null || die 'unable to deactivate'
+nvm deactivate 2>/dev/null || die '1: unable to deactivate'

 \. ../../common.sh

 MOCKS_DIR="${PWD}/mocks"

+# shellcheck disable=SC2317
 nvm_download() {
  if [ "$*" = "-L -s $(nvm_get_mirror node std)/index.tab -o -" ]; then
-    cat "${MOCKS_DIR}/nodejs.org-dist-index.tab"
+    cat "$MOCKS_DIR/nodejs.org-dist-index.tab"
    return
  fi
  return 42
 }

 EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote lts.txt"
-OUTPUT="$(nvm ls-remote --lts | sed 's/[ \t]*$//')"
+OUTPUT="$(run_in_terminal nvm ls-remote --lts | sed 's/[ \t]*$//')"
 EXPECTED_OUTPUT="$(cat "${EXPECTED_OUTPUT_PATH}" | sed 's/[ \t]*$//' )"
-[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "nvm ls-remote --lts did not output expected sorted versions; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
+[ "_$OUTPUT" = "_${EXPECTED_OUTPUT}" ] || die "2: nvm ls-remote --lts did not output expected sorted versions; got >${OUTPUT}< expected 1 >${EXPECTED_OUTPUT}<"

 EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote lts.txt"
-OUTPUT="$(nvm ls-remote "lts/*" | sed 's/[ \t]*$//')"
+OUTPUT="$(run_in_terminal nvm ls-remote 'lts/*' | sed 's/[ \t]*$//')"
 EXPECTED_OUTPUT="$(cat "${EXPECTED_OUTPUT_PATH}" | sed 's/[ \t]*$//' )"
-[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "nvm ls-remote lts/* did not output expected sorted versions; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
+[ "_$OUTPUT" = "_${EXPECTED_OUTPUT}" ] || die "3: nvm ls-remote lts/* did not output expected sorted versions; got >${OUTPUT}< expected 2 >${EXPECTED_OUTPUT}<"

-MOCKS_DIR="${PWD}/mocks"
+MOCKS_DIR="$PWD/mocks"
 LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
 LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)"

 INDEX=1
 printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do
-  ACTUAL="$(nvm ls-remote "lts/-${INDEX}" | sed 's/[ \t]*$//')"
+  ACTUAL="$(run_in_terminal nvm ls-remote "lts/-${INDEX}" | sed 's/[ \t]*$//')"
  MESSAGE="for lts/-${INDEX} (${LTS})"
-  EXPECTED="$(nvm ls-remote "lts/${LTS}" | sed 's/[ \t]*$//')"
-  [ "${ACTUAL}" = "${EXPECTED}" ] || die "${MESSAGE}: expected >${EXPECTED}<, got >${ACTUAL}<"
+  EXPECTED="$(run_in_terminal nvm ls-remote "lts/${LTS}" | sed 's/[ \t]*$//')"
+  [ "${ACTUAL}" = "${EXPECTED}" ] || die "4: ${MESSAGE}: expected >${EXPECTED}<, got >${ACTUAL}<"

  INDEX=$(($INDEX + 1))
 done
@@ -66,8 +68,8 @@ nvm_ls_remote_iojs() {
 }

 EXPECTED_OUTPUT_PATH="${MOCKS_DIR}/nvm ls-remote.txt"
-OUTPUT="$(nvm ls-remote | sed 's/[ \t]*$//')"
+OUTPUT="$(run_in_terminal nvm ls-remote | sed 's/[ \t]*$//')"
 EXPECTED_OUTPUT="$(cat "${EXPECTED_OUTPUT_PATH}" | sed 's/[ \t]*$//' )"
-[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "bare nvm ls-remote did not output expected sorted versions; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
+[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "5: bare nvm ls-remote did not output expected sorted versions; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"

 cleanup
--- a/tests/nvm_download
+++ b/tests/nvm_download
@@ -1,7 +1,7 @@
 #!/bin/sh

 cleanup () {
-  unset -f die cleanup
+  unset -f die cleanup NVM_AUTH_HEADER
  docker stop httpbin && docker rm httpbin
 }
 die () { echo "$@" ; cleanup ; exit 1; }
@@ -17,14 +17,12 @@ nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/install.sh" >/de
 ! nvm_download "https://raw.githubusercontent.com/nvm-sh/nvm/HEAD/wrong_install.sh" >/dev/null || die "nvm_download should fail to download no existing file"

 # nvm_download should pass when calling with auth header
-docker pull kennethreitz/httpbin && SHELL=bash docker run -d --name httpbin -p 80:80 kennethreitz/httpbin
+docker pull kennethreitz/httpbin && docker run --shell=bash -d --name httpbin -p 80:80 kennethreitz/httpbin
 sleep 1 # wait for httpbin to start
 NVM_AUTH_HEADER="Bearer test-token" nvm_download "http://127.0.0.1/bearer" > /dev/null || die 'nvm_download with auth header should send correctly'

 # nvm_download should fail when calling without auth header
 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'
-
-# 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'
+docker stop httpbin && docker rm httpbin

 cleanup
--- a/tests/nvm_ensure_default_set
+++ b/tests/nvm_ensure_default_set
@@ -7,9 +7,9 @@ die () { echo "$@" ; exit 1; }
 \. ../../../nvm.sh

 EXPECTED_OUTPUT="nvm_ensure_default_set: a version is required"
-OUTPUT="$(nvm_ensure_default_set 2>&1 >/dev/null)"
+OUTPUT="$(run_in_terminal nvm_ensure_default_set 2>&1 >/dev/null | strip_colors)"
 EXIT_CODE="$?"
-[ "_$(echo "$OUTPUT" | strip_colors)" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set' did not output "$EXPECTED_OUTPUT", got "$OUTPUT""
-[ "_$EXIT_CODE" = "_1" ] || die "'nvm_ensure_default_set' did not exit with 1, got "$EXIT_CODE""
+[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "'nvm_ensure_default_set' did not output >${EXPECTED_OUTPUT}<, got >${OUTPUT}<"
+[ "_$EXIT_CODE" = "_1" ] || die "'nvm_ensure_default_set' did not exit with 1, got >${EXIT_CODE}<"

 # see test/fast/Aliases for remaining nvm_ensure_default_set tests
--- a/tests/nvm_get_default_packages
+++ b/tests/nvm_get_default_packages
@@ -2,29 +2,27 @@

 \. ../../../nvm.sh

-FILE="${NVM_DIR}/default-packages"
+FILE="$NVM_DIR/default-packages"

 die () { echo "$@" ; cleanup ; exit 1; }
 setup () {
-  if [ -f "${FILE}" ]; then
-    ORIG_DEFAULT_PACKAGES=$(cat "${FILE}")
+  if [ -f $FILE ]; then
+    ORIG_DEFAULT_PACKAGES=$(cat $FILE)
    mkdir -p ./tmp/ ||:
-    mv "${FILE}" ./tmp/default-packages ||:
+    mv $FILE ./tmp/default-packages ||:
  fi
-  touch "${FILE}"
+  touch $FILE
 }
 cleanup () {
-  if [ "${ORIG_DEFAULT_PACKAGES}" != "" ]; then
+  if [ "$ORIG_DEFAULT_PACKAGES" != "" ]; then
    rm -rf ./tmp/
-    echo "${ORIG_DEFAULT_PACKAGES}" > "${FILE}"
-  else
-    rm "${FILE}"
+    echo "$ORIG_DEFAULT_PACKAGES" > $FILE
  fi
 }

 setup

-cat > "${FILE}" << EOF
+cat > $FILE << EOF
 rimraf
 object-inspect@1.0.2

@@ -41,7 +39,7 @@ cleanup

 setup

-cat > "${FILE}" << EOF
+cat > $FILE << EOF
 rimraf
 not~a~package~name
 mkdirp
@@ -55,12 +53,12 @@ cleanup

 setup

-cat > "${FILE}" << EOF
+cat > $FILE << EOF
 rimraf
 not~a~package~name
 mkdirp
 EOF
-printf %s "$(cat "${FILE}")" > "${FILE}" # strip trailing newline
+printf %s "$(cat "${FILE}")" > $FILE # strip trailing newline

 DEFAULT_PKGS="$(nvm_get_default_packages)"
 EXPECTED_PKGS='rimraf not~a~package~name mkdirp'
@@ -70,7 +68,7 @@ cleanup

 setup

-cat > "${FILE}" << EOF
+cat > $FILE << EOF
 object-inspect @ 1.0.2
 rimraf
 EOF
@@ -83,12 +81,12 @@ cleanup

 setup

-rm -rf "${FILE}"
+rm -rf $FILE

 DEFAULT_PKGS="$(nvm_get_default_packages)"
 EXPECTED_PKGS=''
 [ "${DEFAULT_PKGS}" = "${EXPECTED_PKGS}" ] || die "5: expected default packages >${EXPECTED_PKGS}<; got >${DEFAULT_PKGS}<"

-touch "${FILE}"
+touch $FILE

 cleanup
--- a/tests/nvm_install_binary_extract
+++ b/tests/nvm_install_binary_extract
@@ -1,8 +1,8 @@
 #!/bin/sh

 cleanup () {
-  [ -d "${tmp_dir}" ] && rm -rf "${tmp_dir}"
-  [ -d "${NVM_DIR}" ] && rm -rf "${NVM_DIR}"
+  [ -d "$tmp_dir" ] && rm -rf "$tmp_dir"
+  [ -d "$NVM_DIR" ] && rm -rf "$NVM_DIR"
  unset -f die cleanup test_archi nvm_supports_xz
  unset NVM_DIR tmp_dir version archi
 }
@@ -10,34 +10,24 @@ cleanup() {
 die () { echo "$@" ; cleanup ; exit 1; }

 test_archi(){
-  local os
-  os="$1"
-  local version
-  version="$2"
-  local archi
-  archi="$os-$3"
-  local node
-  node="$4"
-  local ext
-  ext="$5"
-  local command
-  command="$6"
-  local command_option
-  command_option="$7"
-  local node_dir
-  node_dir="${tmp_dir}/node-${version}-${archi}"
-  local node_path
-  node_path="${node_dir}/${node}"
+  local os="$1"
+  local version="$2"
+  local archi="$os-$3"
+  local node="$4"
+  local ext="$5"
+  local command="$6"
+  local command_option="$7"
+  local node_path="$tmp_dir/node-$version-$archi/$node"

  # Create tarball
-  mkdir -p "$(dirname "${node_path}")"
-  echo "node ${version}" > "${node_path}"
-  (cd "${tmp_dir}" && "${command}" "${command_option}" "${node_dir}.${ext}" "node-${version}-${archi}")
-  [ -f "${node_dir}.${ext}" ] || die "Unable to create fake ${ext} file"
+  mkdir -p "$(dirname "$node_path")"
+  echo "node $version" > "$node_path"
+  (cd "$tmp_dir" && "$command" "$command_option" "$tmp_dir/node-$version-$archi.$ext" "node-$version-$archi" && rm -rf "$tmp_dir/node-$version-$archi")
+  [ -f "$tmp_dir/node-$version-$archi.$ext" ] || die "Unable to create fake $ext file"

  # Extract it
-  nvm_install_binary_extract "$os" "$version" "$(expr "${version}" : '.\(.*\)')" "${node_dir}.$ext" "${tmp_dir}/files"
-  [ "$(cat "${NVM_DIR}/versions/node/${version}/bin/node")" = "node ${version}" ] || die "Unable to extract ${ext} file"
+  nvm_install_binary_extract "$os" "$version" "${version:1}" "$tmp_dir/node-$version-$archi.$ext" "$tmp_dir/files"
+  [ "$(cat "$NVM_DIR/versions/node/$version/bin/node")" = "node $version" ] || die "Unable to extract $ext file"
 }

 \. ../../../nvm.sh
@@ -49,13 +39,12 @@ type nvm_install_binary_extract > /dev/null 2>&1 || die 'nvm_install_binary_extr

 NVM_DIR=$(mktemp -d)
 tmp_dir=$(mktemp -d)
-if [ -z "${NVM_DIR}" ] || [ -z "${tmp_dir}" ]; then
+if [ -z "$NVM_DIR" ] || [ -z "$tmp_dir" ]; then
  die 'Unable to create temporary folder'
 fi

 # Test windows zip
-# TODO: enable this
-# test_archi 'win' 'v15.6.0' 'x64' 'node' 'zip' 'zip' '-qr'
+test_archi 'win' 'v15.6.0' 'x64' 'node' 'zip' 'zip' '-qr'

 # Test linux tar.xz
 test_archi 'linux' 'v14.15.4' 'x64' 'bin/node' 'tar.xz' 'tar' '-cJf'
--- a/tests/nvm_install_no_progress_bar
+++ b/tests/nvm_install_no_progress_bar
@@ -13,9 +13,11 @@ die () { >&2 echo "$@" ; cleanup ; exit 1; }

 \. ../../../nvm.sh

+nvm_has_colors() { return 1 ; }
+
 cleanup

-OUTPUT="$(TERM=dumb 2>&1 nvm install --no-progress v0.12.18)"
+OUTPUT="$(2>&1 nvm install --no-progress v0.12.18)"
 EXPECTED_OUTPUT="Downloading and installing node v0.12.18...
 Downloading https://nodejs.org/dist/v0.12.18/node-v0.12.18-linux-x64.tar.xz...
 Computing checksum with sha256sum
@@ -23,63 +25,19 @@ Checksums matched!
 Now using node v0.12.18 (npm v2.15.11)
 Creating default alias: default -> v0.12.18 *"

-[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "1: expected >
-${EXPECTED_OUTPUT}<, got >
-${OUTPUT}<"
+[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "expected >${EXPECTED_OUTPUT}<, got >${OUTPUT}<"

 cleanup

-OUTPUT="$(TERM=dumb 2>&1 nvm install v0.12.18)"
+OUTPUT="$(2>&1 nvm install v0.12.18)"
 EXPECTED_OUTPUT="Downloading and installing node v0.12.18...
 Downloading https://nodejs.org/dist/v0.12.18/node-v0.12.18-linux-x64.tar.xz...
-######################################################################### 100.0%
+######################################################################## 100.0%
 Computing checksum with sha256sum
 Checksums matched!
 Now using node v0.12.18 (npm v2.15.11)
 Creating default alias: default -> v0.12.18 *"

-[ "$(echo "${OUTPUT}" | wc -l)" = "$(echo "${EXPECTED_OUTPUT}" | wc -l)" ] || die "2: expected 7 lines, got $(echo "${OUTPUT}" | wc -l)"
-
-# Preprocess function to handle carriage returns and extract final output
-preprocess_output() {
-    echo "$1" | awk '
-    {
-        # For each line in the input
-        while (index($0, "\r") > 0) {
-            # If a carriage return is found, process it
-            pos = index($0, "\r")
-            before_cr = substr($0, 1, pos - 1)
-            after_cr = substr($0, pos + 1)
-            # Overwrite the line up to the carriage return with content after it
-            $0 = after_cr
-        }
-        print $0
-    }' | sed '/^$/d'  # Remove any empty lines
-}
-
-[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || {
-  echo "$OUTPUT" \
-  | while IFS= read -r output_line && IFS= read -r expected_line <&3; do
-    line_number=$((line_number + 1))
-
-    # Strip non-visible characters from both lines
-    clean_output=$(preprocess_output "$output_line")
-
-    if [ "${output_line}" != "${expected_line}" ] && ! echo "${clean_output}" | \grep -qE '^#+ 100\.0%$'; then
-        echo "Difference on line ${line_number}:"
-        echo "Output:    ${output_line}"
-        echo "Expected:  ${expected_line}"
-        echo "Byte-by-byte comparison:"
-        echo "Output:    $(echo "${clean_output}" | od -An -tx1 | tr -d '\n')"
-        echo "Expected:  $(echo "${expected_line}" | od -An -tx1 | tr -d '\n')"
-
-        die "4: expected >
-${EXPECTED_OUTPUT}<, got >
-${OUTPUT}<"
-    fi
-done 3<<EOF
-$EXPECTED_OUTPUT
-EOF
-}
+[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "expected >${EXPECTED_OUTPUT}<, got >${OUTPUT}<"

 cleanup
--- a/tests/nvm_is_version_installed
+++ b/tests/nvm_is_version_installed
--- a/tests/nvm_ls_remote
+++ b/tests/nvm_ls_remote
@@ -8,12 +8,12 @@ cleanup() {

 \. ../../../nvm.sh

-MOCKS_DIR="$PWD/mocks"
+MOCKS_DIR="${PWD}/mocks"

 # sample output at the time the test was written
-TAB_PATH="$MOCKS_DIR/nodejs.org-dist-index.tab"
+TAB_PATH="${MOCKS_DIR}/nodejs.org-dist-index.tab"
 nvm_download() {
-  cat "$TAB_PATH"
+  cat "${TAB_PATH}"
 }

 EXPECTED_OUTPUT_PATH="$MOCKS_DIR/nvm_ls_remote.txt"
--- a/tests/nvm_write_nvmrc
+++ b/tests/nvm_write_nvmrc
--- a/test/fast/nvm
+++ b/test/fast/nvm
--- a/test/install_script/nvm_check_global_modules
+++ b/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
--- a/test/install_script/nvm_download
+++ b/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
--- a/test/installation_node/install
+++ b/test/installation_node/install
@@ -1,10 +1,6 @@
 #!/bin/sh

-die () {
-  unset -f nvm_install_binary nvm_install_source
-  echo "$@"
-  exit 1
-}
+die () { echo "$@" ; exit 1; }

 \. ../../nvm.sh

@@ -26,28 +22,16 @@ nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || die "'nvm run $N
 NVM_CURRENT_DEFAULT="$(nvm_alias default)"
 [ "$NVM_CURRENT_DEFAULT" = "$NVM_TEST_VERSION" ] || die "wrong default alias: $(nvm alias)"

-nvm_install_binary() {
-  >&2 echo 'binary failed'
-  return 1
-}
-
-# binary fails, falls back to source, but if -b is set, fails
+# Falls back to source but if -b is set fails binary download.
 OUTPUT="$(nvm install -b 9.0.0 2>&1)"
-EXPECTED_OUTPUT='binary failed'
-if [ "${OUTPUT#*"${EXPECTED_OUTPUT}"}" = "${OUTPUT}" ]; then
+EXPECTED_OUTPUT='Binary download failed. Download from source aborted.'
+if [ "${OUTPUT#*$EXPECTED_OUTPUT}" = "${OUTPUT}" ]; then
  die "No source binary flag is active and should have returned >${EXPECTED_OUTPUT}<. Instead it returned >${OUTPUT}<"
 fi

-nvm_install_source() {
-  >&2 echo 'source intentionally failed'
-  return 1
-}
-
-# binary fails, falls back to source if -b is not set
+# Falls back to source but if -b is not set.
 OUTPUT="$(nvm install 9.0.0 2>&1)"
-EXPECTED_OUTPUT="binary failed
-Detected that you have 2 CPU core(s)
-Number of CPU core(s) less than or equal to 2, running in single-threaded mode
-source intentionally failed"
-
-[ "${EXPECTED_OUTPUT}" = "${OUTPUT}" ] || die "expected >${EXPECTED_OUTPUT}<, got >${OUTPUT}<"
+EXPECTED_OUTPUT='Binary download failed. Download from source aborted.'
+if [ "${OUTPUT#*$EXPECTED_OUTPUT}" != "${OUTPUT}" ]; then
+  die "No source binary flag is active and should have returned >${EXPECTED_OUTPUT}<. Instead it returned >${OUTPUT}<"
+fi
--- a/reinstall-packages/test-npmlink/index.js
+++ b/reinstall-packages/test-npmlink/index.js
--- a/test/sourcing/Sourcing
+++ b/test/sourcing/Sourcing
@@ -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"
--- a/test/sourcing/Sourcing
+++ b/test/sourcing/Sourcing
@@ -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)" ] \
-  || die "'nvm alias default did not return 'default -> 0.10.1 (-> v0.10.1)', got '${NVM_ALIAS_DEFAULT}'"
+[ "_$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'"
--- a/test/sourcing/Sourcing
+++ b/test/sourcing/Sourcing
@@ -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'
-
-export NVM_DIR="${PWD}/../.."
-rm ../../alias/default
+echo '0.10.2' > ../../.nvmrc || die 'creation of .nvmrc failed'

 \. ../../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)"
-
-rm .nvmrc
+[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT' `nvm ls`"
--- a/test/sourcing/Sourcing
+++ b/test/sourcing/Sourcing
@@ -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'"
--- a/test/sourcing/setup_dir
+++ b/test/sourcing/setup_dir
--- a/test/sourcing/teardown_dir
+++ b/test/sourcing/teardown_dir
@@ -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