wip

Fixes #3499

.github/workflows/release.yml

@@ -19,8 +19,6 @@ jobs:
             raw.githubusercontent.com:443
             registry.npmjs.org:443
       - uses: actions/checkout@v4
-        with:
-          fetch-tags: true
       - uses: actions/setup-node@v4
         with:
           node-version: "14"

.github/workflows/tests.yml

@@ -31,8 +31,6 @@ jobs:
         suite:
           - install_script
           - sourcing
-          - slow
-          - installation_iojs
         shell:
           - sh
           - bash

.travis.yml

@@ -87,8 +87,18 @@ env:
     - SHELL=bash TEST_SUITE=fast
     - SHELL=zsh TEST_SUITE=fast
     #  - SHELL=ksh TEST_SUITE=fast
+    - SHELL=sh TEST_SUITE=slow
+    - SHELL=dash TEST_SUITE=slow
+    - SHELL=bash TEST_SUITE=slow
+    - SHELL=zsh TEST_SUITE=slow
+    #  - SHELL=ksh TEST_SUITE=slow
+    - SHELL=sh TEST_SUITE=installation_iojs
     - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - SHELL=dash TEST_SUITE=installation_iojs
     - SHELL=dash TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - SHELL=bash TEST_SUITE=installation_iojs
     - SHELL=bash TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - SHELL=zsh TEST_SUITE=installation_iojs
     - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    #  - SHELL=ksh TEST_SUITE=installation_iojs
     #  - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1

Dockerfile

@@ -91,20 +91,16 @@ RUN echo 'nvm ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 # Switch to user "nvm" from now
 USER nvm
 
-# Create a script file sourced by both interactive and non-interactive bash shells
-ENV BASH_ENV /home/nvm/.bash_env
-RUN touch "$BASH_ENV"
-RUN echo '. "$BASH_ENV"' >> "$HOME/.bashrc"
-
 # nvm
-RUN echo 'export NVM_DIR="$HOME/.nvm"'                                       >> "$BASH_ENV"
+RUN echo 'export NVM_DIR="$HOME/.nvm"'                                       >> "$HOME/.bashrc"
-RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> "$BASH_ENV"
+RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> "$HOME/.bashrc"
-RUN echo '[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> "$BASH_ENV"
+RUN echo '[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> "$HOME/.bashrc"
 
 # nodejs and tools
-RUN nvm install node
+RUN bash -c 'source $HOME/.nvm/nvm.sh   && \
-RUN npm install -g doctoc urchin eclint dockerfile_lint
+    nvm install node                    && \
-RUN npm install --prefix "$HOME/.nvm/"
+    npm install -g doctoc urchin eclint dockerfile_lint && \
+    npm install --prefix "$HOME/.nvm/"'
 
 # Set WORKDIR to nvm directory
 WORKDIR /home/nvm/.nvm

README.md

@@ -18,7 +18,6 @@
 - [Installing and Updating](#installing-and-updating)
   - [Install & Update Script](#install--update-script)
     - [Additional Notes](#additional-notes)
-    - [Installing in Docker](#installing-in-docker)
     - [Troubleshooting on Linux](#troubleshooting-on-linux)
     - [Troubleshooting on macOS](#troubleshooting-on-macos)
     - [Ansible](#ansible)
@@ -109,7 +108,7 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
 wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/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 (`~/.bashrc`, `~/.bash_profile`, `~/.zshrc`, or `~/.profile`). If you find the install script is updating the wrong profile file, set the `$PROFILE` env var to the profile file’s path, and then rerun the installation script.
+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`).
 
 <a id="profile_snippet"></a>
 ```sh
@@ -121,12 +120,7 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr
 
 - If the environment variable `$XDG_CONFIG_HOME` is present, it will place the `nvm` files there.</sub>
 
-- You can add `--no-use` to the end of the above script to postpone using `nvm` until you manually [`use`](#usage) it:
+- You can add `--no-use` to the end of the above script (...`nvm.sh --no-use`) to postpone using `nvm` until you manually [`use`](#usage) it.
-
-```sh
-export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use # This loads nvm, without auto-using the default version
-```
 
 - You can customize the install source, directory, profile, and version using the `NVM_SOURCE`, `NVM_DIR`, `PROFILE`, and `NODE_VERSION` variables.
 Eg: `curl ... | NVM_DIR="path/to/nvm"`. Ensure that the `NVM_DIR` does not contain a trailing slash.
@@ -135,25 +129,6 @@ Eg: `curl ... | NVM_DIR="path/to/nvm"`. Ensure that the `NVM_DIR` does not conta
 
 - 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'`
 
-#### Installing in Docker
-
-When invoking bash as a non-interactive shell, like in a Docker container, none of the regular profile files are sourced. In order to use `nvm`, `node`, and `npm` like normal, you can instead specify the special `BASH_ENV` variable, which bash sources when invoked non-interactively.
-
-```Dockerfile
-# Use bash for the shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# Create a script file sourced by both interactive and non-interactive bash shells
-ENV BASH_ENV /home/user/.bash_env
-RUN touch "${BASH_ENV}"
-RUN echo '. "${BASH_ENV}"' >> ~/.bashrc
-
-# Download and install nvm
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | PROFILE="${BASH_ENV}" bash
-RUN echo node > .nvmrc
-RUN nvm install
-```
-
 #### Troubleshooting on Linux
 
 On Linux, after running the install script, if you get `nvm: command not found` or see no feedback from your terminal after you type `command -v nvm`, simply close your current terminal, open a new terminal, and try verifying again.
@@ -232,7 +207,7 @@ If you're running a system without prepackaged binary available, which means you
   - [bass](https://github.com/edc/bass) allows you to use utilities written for Bash in fish shell
   - [fast-nvm-fish](https://github.com/brigand/fast-nvm-fish) only works with version numbers (not aliases) but doesn't significantly slow your shell startup
   - [plugin-nvm](https://github.com/derekstavis/plugin-nvm) plugin for [Oh My Fish](https://github.com/oh-my-fish/oh-my-fish), which makes nvm and its completions available in fish shell
-  - [nvm.fish](https://github.com/jorgebucaran/nvm.fish) - The Node.js version manager you'll adore, crafted just for Fish
+  - [fnm](https://github.com/fisherman/fnm) - [fisherman](https://github.com/fisherman/fisherman)-based version manager for fish
   - [fish-nvm](https://github.com/FabioAntunes/fish-nvm) - Wrapper around nvm for fish, delays sourcing nvm until it's actually used.
 
 **Note:** We still have some problems with FreeBSD, because there is no official pre-built binary for FreeBSD, and building from source may need [patches](https://www.freshports.org/www/node/files/patch-deps_v8_src_base_platform_platform-posix.cc); see the issue ticket:
@@ -252,7 +227,7 @@ If you're running a system without prepackaged binary available, which means you
 
 Homebrew installation is not supported. If you have issues with homebrew-installed `nvm`, please `brew uninstall` it, and install it using the instructions below, before filing an issue.
 
-**Note:** If you're using `zsh` you can easily install `nvm` as a zsh plugin. Install [`zsh-nvm`](https://github.com/lukechilds/zsh-nvm) and run `nvm upgrade` to upgrade ([you can set](https://github.com/lukechilds/zsh-nvm#auto-use) `NVM_AUTO_USE=true` to have it automatically detect and use `.nvmrc` files).
+**Note:** If you're using `zsh` you can easily install `nvm` as a zsh plugin. Install [`zsh-nvm`](https://github.com/lukechilds/zsh-nvm) and run `nvm upgrade` to upgrade.
 
 **Note:** Git versions before v1.7 may face a problem of cloning `nvm` source from GitHub via https protocol, and there is also different behavior of git before v1.6, and git prior to [v1.17.10](https://github.com/git/git/commit/5a7d5b683f869d3e3884a89775241afa515da9e7) can not clone tags, so the minimum required git version is v1.7.10. If you are interested in the problem we mentioned here, please refer to GitHub's [HTTPS cloning errors](https://help.github.com/articles/https-cloning-errors/) article.
 
@@ -613,7 +588,9 @@ Run [`npx nvmrc`](https://npmjs.com/nvmrc) to validate an `.nvmrc` file. If that
 
 ### Deeper Shell Integration
 
-You can use [`nvshim`](https://github.com/iamogbz/nvshim) to shim the `node`, `npm`, and `npx` bins to automatically use the `nvm` config in the current directory. `nvshim` is **not** supported by the `nvm` maintainers. Please [report issues to the `nvshim` team](https://github.com/iamogbz/nvshim/issues/new).
+You can use [`avn`](https://github.com/wbyoung/avn) to deeply integrate into your shell and automatically invoke `nvm` when changing directories. `avn` is **not** supported by the `nvm` maintainers. Please [report issues to the `avn` team](https://github.com/wbyoung/avn/issues/new).
+
+You can also use [`nvshim`](https://github.com/iamogbz/nvshim) to shim the `node`, `npm`, and `npx` bins to automatically use the `nvm` config in the current directory. `nvshim` is **not** supported by the `nvm` maintainers. Please [report issues to the `nvshim` team](https://github.com/iamogbz/nvshim/issues/new).
 
 If you prefer a lighter-weight solution, the recipes below have been contributed by `nvm` users. They are **not** supported by the `nvm` maintainers. We are, however, accepting pull requests for more examples.
 
@@ -708,8 +685,6 @@ add-zsh-hook chpwd load-nvmrc
 load-nvmrc
 ```
 
-After saving the file, run `source ~/.zshrc` to reload the configuration with the latest changes made.
-
 ##### fish
 
 This requires that you have [bass](https://github.com/edc/bass) installed.
@@ -1113,5 +1088,6 @@ See [LICENSE.md](./LICENSE.md).
 
 ## Copyright notice
 
-Copyright [OpenJS Foundation](https://openjsf.org) and `nvm` contributors. All rights reserved. The [OpenJS Foundation](https://openjsf.org) has registered trademarks and uses trademarks.  For a list of trademarks of the [OpenJS Foundation](https://openjsf.org), please see our [Trademark Policy](https://trademark-policy.openjsf.org/) and [Trademark List](https://trademark-list.openjsf.org/).  Trademarks and logos not indicated on the [list of OpenJS Foundation trademarks](https://trademark-list.openjsf.org) are trademarks™ or registered® trademarks of their respective holders. Use of them does not imply any affiliation with or endorsement by them.
+Copyright [OpenJS Foundation](https://openjsf.org) and `nvm` contributors. All rights reserved. The [OpenJS Foundation](https://openjsf.org) has registered trademarks and uses trademarks.  For a list of trademarks of the [OpenJS Foundation](https://openjsf.org), please see our [Trademark Policy](https://trademark-policy.openjsf.org/) and [Trademark List](https://trademark-list.openjsf.org/).  Node.js is a trademark of Joyent, Inc. and is used with its permission.  Trademarks and logos not indicated on the [list of OpenJS Foundation trademarks](https://trademark-list.openjsf.org) are trademarks™ or registered® trademarks of their respective holders. Use of them does not imply any affiliation with or endorsement by them.
-[The OpenJS Foundation](https://openjsf.org/) | [Terms of Use](https://terms-of-use.openjsf.org/) | [Privacy Policy](https://privacy-policy.openjsf.org/) | [Bylaws](https://bylaws.openjsf.org/) | [Code of Conduct](https://code-of-conduct.openjsf.org) | [Trademark Policy](https://trademark-policy.openjsf.org/) | [Trademark List](https://trademark-list.openjsf.org/) | [Cookie Policy](https://www.linuxfoundation.org/cookies/)
+
+[The OpenJS Foundation](https://openjsf.org/) | [Terms of Use](https://terms-of-use.openjsf.org/) | [Privacy Policy](https://privacy-policy.openjsf.org/) | [OpenJS Foundation Bylaws](https://bylaws.openjsf.org/) | [Trademark Policy](https://trademark-policy.openjsf.org/) | [Trademark List](https://trademark-list.openjsf.org/) | [Cookie Policy](https://www.linuxfoundation.org/cookies/)

nvm-exec

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
+DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 unset NVM_CD_FLAGS
 

nvm.sh

@@ -136,17 +136,15 @@ nvm_download() {
     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 "
+    ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
-      s/--progress-bar /--progress=bar /
+                            -e 's/--compressed //' \
-      s/--compressed //
+                            -e 's/--fail //' \
-      s/--fail //
+                            -e 's/-L //' \
-      s/-L //
+                            -e 's/-I /--server-response /' \
-      s/-I /--server-response /
+                            -e 's/-s /-q /' \
-      s/-s /-q /
+                            -e 's/-sS /-nv /' \
-      s/-sS /-nv /
+                            -e 's/-o /-O /' \
-      s/-o /-O /
+                            -e 's/-C - /-c /')
-      s/-C - /-c /
-    ")
 
     if [ -n "${NVM_AUTH_HEADER:-}" ]; then
       ARGS="${ARGS} --header \"${NVM_AUTH_HEADER}\""
@@ -1415,11 +1413,11 @@ nvm_add_iojs_prefix() {
 nvm_strip_iojs_prefix() {
   local NVM_IOJS_PREFIX
   NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-
+  if [ "${1-}" = "${NVM_IOJS_PREFIX}" ]; then
-  case "${1-}" in
+    nvm_echo
-    "${NVM_IOJS_PREFIX}") nvm_echo ;;
+  else
-    *) nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}" ;;
+    nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}"
-  esac
+  fi
 }
 
 nvm_ls() {
@@ -1551,15 +1549,12 @@ nvm_ls() {
   fi
 
   if [ "${NVM_ADD_SYSTEM-}" = true ]; then
-    case "${PATTERN}" in
+    if [ -z "${PATTERN}" ] || [ "${PATTERN}" = 'v' ]; then
-      '' | v)
       VERSIONS="${VERSIONS}
 system"
-      ;;
+    elif [ "${PATTERN}" = 'system' ]; then
-      system)
       VERSIONS="system"
-      ;;
+    fi
-    esac
   fi
 
   if [ -z "${VERSIONS}" ]; then
@@ -2737,7 +2732,7 @@ nvm_npm_global_modules() {
   local NPMLIST
   local VERSION
   VERSION="$1"
-  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed -e '1d' -e '/UNMET PEER DEPENDENCY/d')
+  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed 1,1d | nvm_grep -v 'UNMET PEER DEPENDENCY')
 
   local INSTALLS
   INSTALLS=$(nvm_echo "${NPMLIST}" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*@[^ ]*\).*/\1/' -e '/^npm@[^ ]*.*$/ d' | command xargs)
@@ -4080,14 +4075,8 @@ nvm() {
           nvm_echo "Running node ${VERSION}$(nvm use --silent "${VERSION}" && nvm_print_npm_version)"
         fi
       fi
-
+      NODE_VERSION="${VERSION}" "${NVM_DIR}/nvm-exec" "$@"
-      NVM_EXEC="${NVM_DIR}/nvm-exec"
-      if [ ! -f "${NVM_EXEC}" ]; then
-        NVM_EXEC="$(dirname "${BASH_SOURCE[0]-}")/nvm-exec"
-      fi
-      NODE_VERSION="${VERSION}" "${NVM_EXEC}" "$@"
     ;;
-
     "ls" | "list")
       local PATTERN
       local NVM_NO_COLORS

package.json

@@ -45,7 +45,7 @@
     "dockerfile_lint": "^0.3.4",
     "doctoc": "^2.2.1",
     "eclint": "^2.8.1",
-    "markdown-link-check": "^3.13.6",
+    "markdown-link-check": "^3.12.2",
     "replace": "^1.2.2",
     "semver": "^7.6.3",
     "urchin": "^0.0.5"

test/slow/nvm exec/Running 'nvm exec --lts' when NVM_DIR differs from nvm

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-die () { echo "$@" ; exit 1; }
-
-INSTPATH="$(mktemp -p "$(pwd)" -d)"
-trap 'test ! -z "${INSTPATH-}" && test -d "$INSTPATH" && rm -rf "$INSTPATH"' EXIT
-declare -x NVM_DIR=$INSTPATH
-\. ../../../nvm.sh
-
-nvm install --lts || die 'nvm install --lts failed'
-nvm exec --lts npm --version || die "`nvm exec` failed to run"
-declare -x NODE_VERSION="$(nvm exec --lts --silent node --version)"
-
-ln -s ../../../../nvm-exec "$INSTPATH/nvm-exec" || die "failed to create a symlink to $INSTPATH/"
-"$INSTPATH/nvm-exec" npm ls > /dev/null || die "`nvm exec` failed to run using nvm-exec helper"
-

test/slow/nvm run/Running 'nvm run --silent' should work

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-die () { echo "$@" ; exit 1; }
-
-. ../../../nvm.sh
-
-echo "0.10.7" > .nvmrc
-
-# Check nvm run without --silent
-OUTPUT="$(nvm run --version)"
-EXPECTED_OUTPUT="Found '${PWD}/.nvmrc' with version <0.10.7>
-Running node v0.10.7 (npm v1.2.21)
-v0.10.7"
-[ ">${OUTPUT}<" = ">${EXPECTED_OUTPUT}<" ] \
-  || die "\`nvm run\` failed to run; did not match with the .nvmrc version; got >${OUTPUT}<"
-
-OUTPUT="$(nvm run --silent --version)"
-EXPECTED_OUTPUT="v0.10.7"
-[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] \
-  || die "\`nvm run --silent\` failed to run silently; expected no output, got >${OUTPUT}<"
-
-# Output shouldn't be silent if --silent flag is not at the third argument position
-OUTPUT="$(nvm run --version --silent)"
-EXPECTED_OUTPUT=""
-[ "${OUTPUT}" != "${EXPECTED_OUTPUT}" ] \
-  || die "\`nvm run --version --silent\` should not be silent; expected >${OUTPUT}<, got no output"

test/slow/nvm uninstall/Running 'nvm uninstall' with incorrect file permissions fails nicely

@@ -6,7 +6,7 @@ die () { echo "$@" ; exit 1; }
 \. ../../../nvm.sh
 
 # Version to install/uninstall
-NVM_TEST_VERSION=5.10.1
+NVM_TEST_VERSION=15.5.0
 
 # Make sure it's not already here
 [ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
@@ -19,7 +19,9 @@ nvm ls | grep "$NVM_TEST_VERSION" || die "Failed to install node"
 
 # Install global module as root
 npm_path=$(which npm)
-sudo -n "$npm_path" install jspm@'<2' -g || die 'either sudo failed, or `npm install jspm -g` failed`'
+nvm_err "${PATH}"
+PATH="${PATH}" sudo -n echo "${PATH}" || die 'sudo echo failed'
+PATH="${PATH}" sudo -n "$npm_path" install jspm@'<2' -g || die 'either sudo failed, or `npm install jspm -g` failed`'
 
 # Switch to another version so we can uninstall
 nvm use 0.12.7