Merge c1064550872bfc16afe02ec6edeb73ff3847a3da into 4beab63631764fc381a0e56273faf8d43b8f9509

[Fix] declare an unbound variable
Fixes #3402
2025-08-17 19:13:43 +00:00 · 2024-08-07 09:39:57 +00:00 · 2024-08-07 17:38:37 +12:00 · 2024-05-30 11:58:37 -07:00
2 changed files with 12 additions and 6 deletions
--- a/install.sh
+++ b/install.sh
@ -40,7 +40,7 @@ nvm_profile_is_bash_or_zsh() {
  local TEST_PROFILE
  TEST_PROFILE="${1-}"
  case "${TEST_PROFILE-}" in
-    *"/.bashrc" | *"/.bash_profile" | *"/.zshrc" | *"/.zprofile")
+    *"/.bashrc" | *"/.bash_profile" | *"/.zshenv" | *"/.zshrc" | *"/.zprofile")
      return
    ;;
    *)
@ -300,11 +300,13 @@ nvm_detect_profile() {
      DETECTED_PROFILE="$HOME/.zshrc"
    elif [ -f "$HOME/.zprofile" ]; then
      DETECTED_PROFILE="$HOME/.zprofile"
+    elif [ -f "$HOME/.zshenv" ]; then
+      DETECTED_PROFILE="$HOME/.zshenv"
    fi
  fi

  if [ -z "$DETECTED_PROFILE" ]; then
-    for EACH_PROFILE in ".profile" ".bashrc" ".bash_profile" ".zprofile" ".zshrc"
+    for EACH_PROFILE in ".profile" ".bashrc" ".bash_profile" ".zprofile" ".zshrc" ".zshenv"
    do
      if DETECTED_PROFILE="$(nvm_try_profile "${HOME}/${EACH_PROFILE}")"; then
        break
--- a/nvm.sh
+++ b/nvm.sh
@ -503,9 +503,9 @@ $(nvm_wrap_with_color_code 'y' "${warn_text}")"
 }

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

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

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

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

  while IFS= read -r line; do
    if [ -z "${line}" ]; then
Author	SHA1	Message	Date
Steven Dee (Jōshin)	932debb520	Merge c1064550872bfc16afe02ec6edeb73ff3847a3da into 4beab63631764fc381a0e56273faf8d43b8f9509	2024-08-07 09:39:57 +00:00
Jordan Harband	4beab63631	[Fix] declare an unbound variable Fixes #3402	2024-08-07 17:38:37 +12:00
Jōshin	c106455087	[Fix] `install.sh`: install looks for .zshenv A zsh user may have set `ZDOTDIR` to something other than `$HOME`, in which case the profile and rc files will not be located under `$HOME`. But unless the system `zshenv` has done something unusual, it is usually a safe bet that there will be a `$HOME/.zshenv` that, if nothing else, will be setting up `ZDOTDIR`.	2024-05-30 11:58:37 -07:00