Merge cae2eb71a2 into cd22c84026

`git` may be configured locally to use a non-'origin' default remote name.
So, specify 'origin' as the remote name when cloning to get the expected setup.

.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/tests.yml

@@ -1,6 +1,6 @@
 name: urchin tests
 
-on: [push, pull_request]
+on: [push]
 
 permissions:
   contents: read

.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

install.sh

@@ -163,7 +163,8 @@ install_nvm_from_git() {
       }
     else
       # Cloning repo
-      command git clone "$(nvm_source)" --depth=1 "${INSTALL_DIR}" || {
+      command git clone "$(nvm_source)" --depth=1 -o origin "${INSTALL_DIR}" 2> /dev/null \
+        || command git clone "$(nvm_source)" --depth=1 "${INSTALL_DIR}" || {
         nvm_echo >&2 'Failed to clone nvm repo. Please report this!'
         exit 2
       }
@@ -306,7 +307,7 @@ nvm_detect_profile() {
   if [ -z "$DETECTED_PROFILE" ]; then
     for EACH_PROFILE in ".profile" ".bashrc" ".bash_profile" ".zprofile" ".zshrc"
     do
-      if DETECTED_PROFILE="$(nvm_try_profile "${ZDOTDIR:-${HOME}}/${EACH_PROFILE}")"; then
+      if DETECTED_PROFILE="$(nvm_try_profile "${HOME}/${EACH_PROFILE}")"; then
         break
       fi
     done

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

@@ -23,7 +23,7 @@ cleanup () {
   unset -f setup cleanup die
   unset ZDOTDIR
   rm -f ".bashrc" ".bash_profile" ".zprofile" ".zshrc" ".profile" "test_profile" > "/dev/null" 2>&1
-  rm -rf zdotdir 2>&1
+  rm -rf zdot>&1
 }
 
 die () { echo "$@" '$NVM_DETECT_PROFILE:' "$NVM_DETECT_PROFILE"; cleanup; exit 1; }
@@ -35,37 +35,37 @@ setup
 #
 
 # setting $PROFILE to /dev/null should return no detected profile
-NVM_DETECT_PROFILE="$(PROFILE='/dev/null' nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(PROFILE='/dev/null'; nvm_detect_profile)"
 if [ -n "$NVM_DETECT_PROFILE" ]; then
   die "nvm_detect_profile still detected a profile even though PROFILE=/dev/null"
 fi
 
 # .bashrc should be detected for bash
-NVM_DETECT_PROFILE="$(SHELL="/bin/bash" PROFILE= nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/bash"; unset PROFILE; nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then
   die "nvm_detect_profile didn't pick \$HOME/.bashrc for bash"
 fi
 
 # $PROFILE should override .bashrc profile detection
-NVM_DETECT_PROFILE="$(SHELL="/bin/bash" PROFILE="test_profile" nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/bash"; PROFILE="test_profile"; nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then
   die "nvm_detect_profile ignored \$PROFILE"
 fi
 
 # zdotdir/.zshrc should be detected for zsh
-NVM_DETECT_PROFILE="$(SHELL="/bin/zsh" PROFILE= nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/zsh"; unset PROFILE; nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$ZDOTDIR/.zshrc" ]; then
   die "nvm_detect_profile didn't pick \$ZDOTDIR/.zshrc for zsh"
 fi
 
 # .zshrc should be detected for zsh
-NVM_DETECT_PROFILE="$(SHELL="/bin/zsh" PROFILE= ZDOTDIR= nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/zsh"; unset PROFILE; unset ZDOTDIR; nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then
   die "nvm_detect_profile didn't pick \$HOME/.zshrc for zsh"
 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
@@ -75,14 +75,14 @@ fi
 #
 
 # $PROFILE is a valid file
-NVM_DETECT_PROFILE="$(PROFILE="test_profile" SHELL= nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(PROFILE="test_profile"; unset SHELL; nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "test_profile" ]; then
   die "nvm_detect_profile didn't pick \$PROFILE when it was a valid file"
 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
@@ -94,58 +94,58 @@ fi
 #
 
 # It should favor .profile if file exists
-NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(unset SHELL; 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)"
+NVM_DETECT_PROFILE="$(unset SHELL; 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)"
+NVM_DETECT_PROFILE="$(unset SHELL; 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)"
+NVM_DETECT_PROFILE="$(unset 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)"
+NVM_DETECT_PROFILE="$(unset SHELL; unset 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)"
+NVM_DETECT_PROFILE="$(unset 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)"
+NVM_DETECT_PROFILE="$(unset SHELL; unset 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)"
+NVM_DETECT_PROFILE="$(unset 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