Merge cf9beb7f86ba3c806108ee79fe2f9fae26171219 into 24deac7ac53a5b435ce592807ff015a9e788a1fa

- https://openjsf.org/ecosystem-sustainability-program

README.md

@@ -61,6 +61,8 @@
 - [macOS Troubleshooting](#macos-troubleshooting)
 - [WSL Troubleshooting](#wsl-troubleshooting)
 - [Maintainers](#maintainers)
+- [Project Support](#project-support)
+- [Enterprise Support](#enterprise-support)
 - [License](#license)
 - [Copyright notice](#copyright-notice)
 
@@ -1070,6 +1072,16 @@ You can check the contents of the file by running:
 
 Currently, the sole maintainer is [@ljharb](https://github.com/ljharb) - more maintainers are quite welcome, and we hope to add folks to the team over time. [Governance](./GOVERNANCE.md) will be re-evaluated as the project evolves.
 
+## Project Support
+
+Only the latest version (v0.39.7 at this time) is supported.
+
+## Enterprise Support
+
+If you are unable to update to the latest version of `nvm`, our [partners](https://openjsf.org/ecosystem-sustainability-program) provide commercial security fixes for all unsupported versions:
+
+  - [HeroDevs Never-Ending Support](https://www.herodevs.com/support?utm_source=OpenJS&utm_medium=Link&utm_campaign=nvm_openjs)
+
 ## License
 
 See [LICENSE.md](./LICENSE.md).

nvm.sh

@@ -449,6 +449,12 @@ nvm_tree_contains_path() {
   previous_pathdir="${node_path}"
   local pathdir
   pathdir=$(dirname "${previous_pathdir}")
+
+  # get real directory in case of symbolic links
+  if [ -d "${pathdir-}" ]; then
+    pathdir="$(nvm_cd -P "${pathdir}" && pwd)"
+  fi
+
   while [ "${pathdir}" != '' ] && [ "${pathdir}" != '.' ] && [ "${pathdir}" != '/' ] &&
       [ "${pathdir}" != "${tree}" ] && [ "${pathdir}" != "${previous_pathdir}" ]; do
     previous_pathdir="${pathdir}"

test/fast/Unit tests/nvm_tree_contains_path

@@ -1,6 +1,8 @@
 #!/bin/sh
 
 cleanup () {
+  rm tmp3/tmp2
+  rmdir tmp3
   rm tmp/node
   rmdir tmp
   rm tmp2/node
@@ -14,6 +16,8 @@ mkdir -p tmp
 touch tmp/node
 mkdir -p tmp2
 touch tmp2/node
+mkdir -p tmp3
+ln -s tmp2 tmp3/
 
 [ "$(nvm_tree_contains_path 2>&1)" = "both the tree and the node path are required" ] || die 'incorrect error message with no args'
 [ "$(nvm_tree_contains_path > /dev/null 2>&1 ; echo $?)" = "2" ] || die 'incorrect error code with no args'
@@ -28,4 +32,6 @@ nvm_tree_contains_path tmp2 tmp2/node || die '"tmp2" should contain "tmp2/node"'
 
 nvm_tree_contains_path tmp2 tmp/node && die '"tmp2" should not contain "tmp/node"'
 
+nvm_tree_contains_path tmp2 tmp3 && die 'no idea'
+
 cleanup