Merge cbaffd8eca into 9659af6c16

.github/workflows/latest-npm.yml

@@ -37,11 +37,6 @@ jobs:
       matrix:
         node-version: ${{ fromJson(needs.matrix.outputs.latest) }}
         include:
-          - node-version: "21"
-          - node-version: "20.5"
-          - node-version: "20.4"
-          - node-version: "14.17"
-          - node-version: "14.16"
           - node-version: "9.2"
           - node-version: "9.1"
           - node-version: "9.0"

.github/workflows/toc.yml

@@ -20,7 +20,6 @@ jobs:
         allowed-endpoints:
           github.com:443
           registry.npmjs.org:443
-          api.github.com:443
     - uses: actions/checkout@v4
       with:
         # https://github.com/actions/checkout/issues/217#issue-599945005
@@ -31,7 +30,7 @@ jobs:
     - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - uses: actions/setup-node@v4
       with:
-        node-version: 'lts/*'
+        node-version: '16'
     - run: npm install
     - run: npm run doctoc
     - name: commit changes

README.md

@@ -349,7 +349,7 @@ In place of a version pointer like "14.7" or "16.3" or "12.22.1", you can use th
 
 ### Long-term Support
 
-Node has a [schedule](https://github.com/nodejs/Release#release-schedule) for long-term support (LTS) You can reference LTS versions in aliases and `.nvmrc` files with the notation `lts/*` for the latest LTS, and `lts/argon` for LTS releases from the "argon" line, for example. In addition, the following commands support LTS arguments:
+Node has a [schedule](https://github.com/nodejs/Release#release-schedule) for long-term support (LTS) You can reference LTS versions in aliases and `.nvmrc` files with the notation `lts/*` for the latest _Active_ LTS, and `lts/argon` for LTS releases from the "argon" line, for example. In addition, the following commands support LTS arguments:
 
   - `nvm install --lts` / `nvm install --lts=argon` / `nvm install 'lts/*'` / `nvm install lts/argon`
   - `nvm uninstall --lts` / `nvm uninstall --lts=argon` / `nvm uninstall 'lts/*'` / `nvm uninstall lts/argon`

nvm.sh

@@ -354,21 +354,6 @@ nvm_install_latest_npm() {
     if [ $NVM_IS_19_OR_ABOVE -eq 1 ] && nvm_version_greater_than_or_equal_to "${NODE_VERSION}" 20.5.0; then
       NVM_IS_20_5_OR_ABOVE=1
     fi
-    local NVM_IS_20_17_or_ABOVE
-    NVM_IS_20_17_or_ABOVE=0
-    if [ $NVM_IS_20_5_OR_ABOVE -eq 1 ] && nvm_version_greater 20.17.0 "${NODE_VERSION}"; then
-      NVM_IS_20_17_or_ABOVE=1
-    fi
-    local NVM_IS_21_OR_ABOVE
-    NVM_IS_21_OR_ABOVE=0
-    if [ $NVM_IS_20_17_or_ABOVE -eq 1 ] && nvm_version_greater 21.0.0 "${NODE_VERSION}"; then
-      NVM_IS_21_OR_ABOVE=1
-    fi
-    local NVM_IS_22_9_OR_ABOVE
-    NVM_IS_22_9_OR_ABOVE=0
-    if [ $NVM_IS_21_OR_ABOVE -eq 1 ] && nvm_version_greater 22.9.0 "${NODE_VERSION}"; then
-      NVM_IS_22_9_OR_ABOVE=1
-    fi
 
     if [ $NVM_IS_4_4_OR_BELOW -eq 1 ] || {
       [ $NVM_IS_5_OR_ABOVE -eq 1 ] && nvm_version_greater 5.10.0 "${NODE_VERSION}"; \
@@ -414,15 +399,8 @@ nvm_install_latest_npm() {
       [ $NVM_IS_18_17_OR_ABOVE -eq 0 ] \
       || { [ $NVM_IS_19_OR_ABOVE -eq 1 ] && [ $NVM_IS_20_5_OR_ABOVE -eq 0 ]; } \
     ; then
-      # TODO: 10.8.3 can run on 16.20.2?? https://github.com/nodejs/Release/issues/884#issuecomment-2558077691
       nvm_echo '* `npm` `v9.x` is the last version that works on `node` `< v18.17`, `v19`, or `v20.0` - `v20.4`'
       $NVM_NPM_CMD install -g npm@9
-    elif \
-      [ $NVM_IS_20_17_or_ABOVE -eq 0 ] \
-      || { [ $NVM_IS_21_OR_ABOVE -eq 1 ] && [ $NVM_IS_22_9_OR_ABOVE -eq 0 ]; } \
-    ; then
-      nvm_echo '* `npm` `v10.x` is the last version that works on `node` `< v20.17`, `v21`, or `v22.0` - `v22.8`'
-      $NVM_NPM_CMD install -g npm@10
     else
       nvm_echo '* Installing latest `npm`; if this does not work on your node version, please report a bug!'
       $NVM_NPM_CMD install -g npm
@@ -444,7 +422,8 @@ fi
 if [ -z "${NVM_DIR-}" ]; then
   # shellcheck disable=SC2128
   if [ -n "${BASH_SOURCE-}" ]; then
-    NVM_SCRIPT_SOURCE="${BASH_SOURCE}"
+    # shellcheck disable=SC2169,SC3054
+    NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}"
   fi
   # shellcheck disable=SC2086
   NVM_DIR="$(nvm_cd ${NVM_CD_FLAGS} "$(dirname "${NVM_SCRIPT_SOURCE:-$0}")" >/dev/null && \pwd)"

test/install_script/nvm_detect_profile

@@ -65,7 +65,7 @@ if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then
 fi
 
 # $PROFILE should override .zshrc profile detection
-NVM_DETECT_PROFILE="$(SHELL="/usr/bin/zsh" PROFILE="test_profile" nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/usr/bin/zsh"; PROFILE="test_profile"; nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then
   die "nvm_detect_profile ignored \$PROFILE"
 fi
@@ -82,7 +82,7 @@ fi
 
 # $PROFILE is not a valid file
 rm "test_profile"
-NVM_DETECT_PROFILE="$(PROFILE="test_profile" nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(PROFILE="test_profile"; nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" = "test_profile" ]; then
   die "nvm_detect_profile picked \$PROFILE when it was an invalid file"
 fi
@@ -96,56 +96,56 @@ fi
 # It should favor .profile if file exists
 NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.profile" ]; then
-  die "nvm_detect_profile should have selected .profile; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have selected .profile"
 fi
 
 # Otherwise, it should favor .bashrc if file exists
 rm ".profile"
 NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then
-  die "nvm_detect_profile should have selected .bashrc; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have selected .bashrc"
 fi
 
 # Otherwise, it should favor .bash_profile if file exists
 rm ".bashrc"
 NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.bash_profile" ]; then
-  die "nvm_detect_profile should have selected .bash_profile; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have selected .bash_profile"
 fi
 
 # Otherwise, it should favor zdotdir/.zprofile if file exists
 rm ".bash_profile"
 NVM_DETECT_PROFILE="$(SHELL= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$ZDOTDIR/.zprofile" ]; then
-  die "nvm_detect_profile should have selected zdotdir/.zprofile; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have selected zdotdir/.zprofile"
 fi
 
 # Otherwise, it should favor .zprofile if file exists
 rm "zdotdir/.zprofile"
 NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zprofile" ]; then
-  die "nvm_detect_profile should have selected .zprofile; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have selected .zprofile"
 fi
 
 # Otherwise, it should favor zdotdir/.zshrc if file exists
 rm ".zprofile"
 NVM_DETECT_PROFILE="$(SHELL= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$ZDOTDIR/.zshrc" ]; then
-  die "nvm_detect_profile should have selected zdotdir/.zshrc; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have selected zdotdir/.zshrc"
 fi
 
 # Otherwise, it should favor .zshrc if file exists
 rm "zdotdir/.zshrc"
 NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then
-  die "nvm_detect_profile should have selected .zshrc; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have selected .zshrc"
 fi
 
 # It should be empty if none is found
 rm ".zshrc"
 NVM_DETECT_PROFILE="$(SHELL= nvm_detect_profile)"
 if [ ! -z "$NVM_DETECT_PROFILE" ]; then
-  die "nvm_detect_profile should have returned an empty value; got $NVM_DETECT_PROFILE"
+  die "nvm_detect_profile should have returned an empty value"
 fi
 
 cleanup

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=15.5.0
+NVM_TEST_VERSION=5.10.1
 
 # Make sure it's not already here
 [ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
@@ -19,9 +19,7 @@ nvm ls | grep "$NVM_TEST_VERSION" || die "Failed to install node"
 
 # Install global module as root
 npm_path=$(which npm)
-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`'
+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