Merge 6375e4ed79dc584a8174e5816d68a1c31b6d9b27 into 6b70c40f151ca051d403453bf019e1707b33bd5b

Fixes #3447

nvm.sh

@@ -196,6 +196,9 @@ nvm_install_latest_npm() {
   nvm_echo 'Attempting to upgrade to the latest working version of npm...'
   local NODE_VERSION
   NODE_VERSION="$(nvm_strip_iojs_prefix "$(nvm_ls_current)")"
+  local NPM_VERSION
+  NPM_VERSION="$(npm --version 2>/dev/null)"
+
   if [ "${NODE_VERSION}" = 'system' ]; then
     NODE_VERSION="$(node --version)"
   elif [ "${NODE_VERSION}" = 'none' ]; then
@@ -206,8 +209,6 @@ nvm_install_latest_npm() {
     nvm_err 'Unable to obtain node version.'
     return 1
   fi
-  local NPM_VERSION
-  NPM_VERSION="$(npm --version 2>/dev/null)"
   if [ -z "${NPM_VERSION}" ]; then
     nvm_err 'Unable to obtain npm version.'
     return 2
@@ -439,6 +440,7 @@ else
 fi
 unset NVM_SCRIPT_SOURCE 2>/dev/null
 
+
 nvm_tree_contains_path() {
   local tree
   tree="${1-}"
@@ -454,14 +456,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}"