Merge d8c36093c7a7b0a90cdae65fd95cec36dc92563b into 06413631029de32cd9af15b6b7f6ed77743cbd79

Fixes #3128

.github/workflows/tests.yml

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

CONTRIBUTING.md

@@ -113,3 +113,11 @@ Co-authored-by: Name Here <email@here>
 
 # Where can I ask for help?
 If you have any questions, please contact [@LJHarb](mailto:ljharb@gmail.com).
+
+# Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+  - The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
+  - The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
+  - The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
+  - I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.

install.sh

@@ -296,17 +296,17 @@ nvm_detect_profile() {
       DETECTED_PROFILE="$HOME/.bash_profile"
     fi
   elif [ "${SHELL#*zsh}" != "$SHELL" ]; then
-    if [ -f "$HOME/.zshrc" ]; then
+    if [ -f "${ZDOTDIR:-${HOME}}/.zshrc" ]; then
-      DETECTED_PROFILE="$HOME/.zshrc"
+      DETECTED_PROFILE="${ZDOTDIR:-${HOME}}/.zshrc"
-    elif [ -f "$HOME/.zprofile" ]; then
+    elif [ -f "${ZDOTDIR:-${HOME}}/.zprofile" ]; then
-      DETECTED_PROFILE="$HOME/.zprofile"
+      DETECTED_PROFILE="${ZDOTDIR:-${HOME}}/.zprofile"
     fi
   fi
 
   if [ -z "$DETECTED_PROFILE" ]; then
     for EACH_PROFILE in ".profile" ".bashrc" ".bash_profile" ".zprofile" ".zshrc"
     do
-      if DETECTED_PROFILE="$(nvm_try_profile "${HOME}/${EACH_PROFILE}")"; then
+      if DETECTED_PROFILE="$(nvm_try_profile "${ZDOTDIR:-${HOME}}/${EACH_PROFILE}")"; then
         break
       fi
     done
@@ -422,10 +422,10 @@ nvm_do_install() {
   local PROFILE_INSTALL_DIR
   PROFILE_INSTALL_DIR="$(nvm_install_dir | command sed "s:^$HOME:\$HOME:")"
 
-  SOURCE_STR="\\nexport NVM_DIR=\"${PROFILE_INSTALL_DIR}\"\\n[ -s \"\$NVM_DIR/nvm.sh\" ] && \\. \"\$NVM_DIR/nvm.sh\"  # This loads nvm\\n"
+  SOURCE_STR="\\nexport NVM_DIR=\"${PROFILE_INSTALL_DIR}\"\\n[ ! -s \"\$NVM_DIR/nvm.sh\" ] || \\. \"\$NVM_DIR/nvm.sh\"  # This loads nvm\\n"
 
   # shellcheck disable=SC2016
-  COMPLETION_STR='[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion\n'
+  COMPLETION_STR='[ ! -s "$NVM_DIR/bash_completion" ] || \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion\n'
   BASH_OR_ZSH=false
 
   if [ -z "${NVM_PROFILE-}" ] ; then

test/install_script/nvm_detect_profile

@@ -3,12 +3,16 @@
 setup () {
   HOME="."
   NVM_ENV=testing \. ../../install.sh
+  ZDOTDIR="$HOME/zdotdir"
+  mkdir -p zdotdir
   touch ".bashrc"
   touch ".bash_profile"
   touch ".zprofile"
   touch ".zshrc"
   touch ".profile"
   touch "test_profile"
+  touch "zdotdir/.zshrc"
+  touch "zdotdir/.zprofile"
 }
 
 cleanup () {
@@ -17,7 +21,9 @@ cleanup () {
   unset NVM_DETECT_PROFILE
   unset SHELL
   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
 }
 
 die () { echo "$@" '$NVM_DETECT_PROFILE:' "$NVM_DETECT_PROFILE"; cleanup; exit 1; }
@@ -29,49 +35,54 @@ 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"; unset PROFILE; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/bash" 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)"
+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"; unset PROFILE; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL="/bin/zsh" PROFILE= 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
 
-
 #
 # Confirm $PROFILE is only returned when it points to a valid file
 #
 
 # $PROFILE is a valid file
-NVM_DETECT_PROFILE="$(PROFILE="test_profile"; unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(PROFILE="test_profile" 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
@@ -83,44 +94,58 @@ fi
 #
 
 # It should favor .profile if file exists
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.profile" ]; then
-  die "nvm_detect_profile should have selected .profile"
+  die "nvm_detect_profile should have selected .profile; got $NVM_DETECT_PROFILE"
 fi
 
 # Otherwise, it should favor .bashrc if file exists
 rm ".profile"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.bashrc" ]; then
-  die "nvm_detect_profile should have selected .bashrc"
+  die "nvm_detect_profile should have selected .bashrc; got $NVM_DETECT_PROFILE"
 fi
 
 # Otherwise, it should favor .bash_profile if file exists
 rm ".bashrc"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+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"
+  die "nvm_detect_profile should have selected .bash_profile; got $NVM_DETECT_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"
 fi
 
 # Otherwise, it should favor .zprofile if file exists
-rm ".bash_profile"
+rm "zdotdir/.zprofile"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zprofile" ]; then
-  die "nvm_detect_profile should have selected .zprofile"
+  die "nvm_detect_profile should have selected .zprofile; got $NVM_DETECT_PROFILE"
+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"
 fi
 
 # Otherwise, it should favor .zshrc if file exists
-rm ".zprofile"
+rm "zdotdir/.zshrc"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= ZDOTDIR= nvm_detect_profile)"
 if [ "$NVM_DETECT_PROFILE" != "$HOME/.zshrc" ]; then
-  die "nvm_detect_profile should have selected .zshrc"
+  die "nvm_detect_profile should have selected .zshrc; got $NVM_DETECT_PROFILE"
 fi
 
 # It should be empty if none is found
 rm ".zshrc"
-NVM_DETECT_PROFILE="$(unset SHELL; nvm_detect_profile)"
+NVM_DETECT_PROFILE="$(SHELL= nvm_detect_profile)"
 if [ ! -z "$NVM_DETECT_PROFILE" ]; then
-  die "nvm_detect_profile should have returned an empty value"
+  die "nvm_detect_profile should have returned an empty value; got $NVM_DETECT_PROFILE"
 fi
 
 cleanup