mshillam
/
nvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge e7e5b372e9 into 3fea5493a4

This commit is contained in:
Charlie Hileman 2021-03-29 17:27:27 -07:00 committed by GitHub
parent 3fea5493a4 e7e5b372e9
commit 3fff06a827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nvm.sh
View File

@ -328,6 +328,12 @@ nvm_tree_contains_path() {
local pathdir local pathdir
pathdir=$(dirname "${node_path}") pathdir=$(dirname "${node_path}")
# 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}" ]; do while [ "${pathdir}" != "" ] && [ "${pathdir}" != "." ] && [ "${pathdir}" != "/" ] && [ "${pathdir}" != "${tree}" ]; do
pathdir=$(dirname "${pathdir}") pathdir=$(dirname "${pathdir}")
done done

6
test/fast/Unit tests/nvm_tree_contains_path
View File

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
cleanup () { cleanup () {
rm tmp3/tmp2
rmdir tmp3
rm tmp/node rm tmp/node
rmdir tmp rmdir tmp
rm tmp2/node rm tmp2/node
@ -14,6 +16,8 @@ mkdir -p tmp
touch tmp/node touch tmp/node
mkdir -p tmp2 mkdir -p tmp2
touch tmp2/node 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 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' [ "$(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 tmp/node && die '"tmp2" should not contain "tmp/node"'
nvm_tree_contains_path tmp2 tmp3 && die 'no idea'
cleanup cleanup