Merge 6375e4ed79dc584a8174e5816d68a1c31b6d9b27 into 4beab63631764fc381a0e56273faf8d43b8f9509

Fixes #3402

nvm.sh

@@ -434,6 +434,7 @@ else
 fi
 unset NVM_SCRIPT_SOURCE 2>/dev/null
 
+
 nvm_tree_contains_path() {
   local tree
   tree="${1-}"
@@ -449,14 +450,21 @@ nvm_tree_contains_path() {
   previous_pathdir="${node_path}"
   local pathdir
   pathdir=$(dirname "${previous_pathdir}")
+
+  # Convert tree path to canonical form for case-insensitive comparison
+  local tree_canonical
+  tree_canonical=$(cd "${tree}" && pwd -P)
+
   while [ "${pathdir}" != '' ] && [ "${pathdir}" != '.' ] && [ "${pathdir}" != '/' ] &&
-      [ "${pathdir}" != "${tree}" ] && [ "${pathdir}" != "${previous_pathdir}" ]; do
+      [ "${pathdir}" != "${tree_canonical}" ] && [ "${pathdir}" != "${previous_pathdir}" ]; do
     previous_pathdir="${pathdir}"
     pathdir=$(dirname "${previous_pathdir}")
   done
-  [ "${pathdir}" = "${tree}" ]
+
+  [ "${pathdir}" = "${tree_canonical}" ]
 }
 
+
 nvm_find_project_dir() {
   local path_
   path_="${PWD}"
@@ -503,9 +511,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 +523,12 @@ nvm_process_nvmrc() {
   fi
 
   # Initialize key-value storage
-  local keys=''
+  local keys
-  local values=''
+  keys=''
+  local values
+  values=''
+  local unpaired_line
+  unpaired_line=''
 
   while IFS= read -r line; do
     if [ -z "${line}" ]; then