mirror of
https://github.com/nvm-sh/nvm.git
synced 2025-12-12 08:04:18 +00:00
Compare commits
2 Commits
94126c4b12
...
travis3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f32e7bad4 | ||
|
|
9bd27d3897 |
6
nvm.sh
6
nvm.sh
@@ -454,12 +454,6 @@ nvm_tree_contains_path() {
|
|||||||
previous_pathdir="${node_path}"
|
previous_pathdir="${node_path}"
|
||||||
local pathdir
|
local pathdir
|
||||||
pathdir=$(dirname "${previous_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}" != '/' ] &&
|
while [ "${pathdir}" != '' ] && [ "${pathdir}" != '.' ] && [ "${pathdir}" != '/' ] &&
|
||||||
[ "${pathdir}" != "${tree}" ] && [ "${pathdir}" != "${previous_pathdir}" ]; do
|
[ "${pathdir}" != "${tree}" ] && [ "${pathdir}" != "${previous_pathdir}" ]; do
|
||||||
previous_pathdir="${pathdir}"
|
previous_pathdir="${pathdir}"
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
#!/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
|
||||||
@@ -16,8 +14,6 @@ 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'
|
||||||
@@ -32,6 +28,4 @@ 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
|
||||||
|
|||||||
Reference in New Issue
Block a user