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

Properly outputting the version when nvm_version_path outputs the new "versions" subdirectory.

master
Jordan Harband 2014-12-19 16:31:37 -08:00
parent 9e17b5059c
commit 2d78d69d4c
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nvm.sh
View File

@ -988,7 +988,7 @@ nvm() {
echo "$VERSION version is not installed yet" >&2 echo "$VERSION version is not installed yet" >&2
return 1 return 1
fi fi
echo $NVM_DIR/$VERSION/bin/node echo "$NVM_VERSION_DIR/bin/node"
;; ;;
"alias" ) "alias" )
mkdir -p "$NVM_DIR/alias" mkdir -p "$NVM_DIR/alias"

28
test/fast/Listing paths/Running "nvm which 0.0.2" should display only version 0.0.2.
View File

@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
mkdir ../../../v0.0.2 mkdir -p ../../../v0.0.2
mkdir ../../../v0.0.20 mkdir -p ../../../v0.0.20
mkdir -p ../../../versions/v0.12.0
. ../../../nvm.sh . ../../../nvm.sh
@ -9,13 +10,18 @@ die () { echo $@ ; exit 1; }
# The result should contain only the appropriate version numbers. # The result should contain only the appropriate version numbers.
nvm which 0.0.2 nvm which 0.0.2 || die "v0.0.2 not found"
nvm which 0.0.2 | grep "$NVM_DIR/v0.0.2/bin/node" > /dev/null NVM_BIN="$(nvm which 0.0.2)"
if [ $? -ne 0 ]; then [ "_$NVM_BIN" = "_$(nvm_version_path v0.0.2)/bin/node" ] \
die '"nvm which 0.0.2" did not contain the correct path' || die "'nvm which 0.0.2' did not contain the correct path: got '$NVM_BIN'"
fi
nvm which 0.0.20 || die "v0.0.20 not found"
NVM_BIN="$(nvm which 0.0.20)"
[ "_$NVM_BIN" = "_$(nvm_version_path v0.0.20)/bin/node" ] \
|| die "'nvm which 0.20.0' did not contain the correct path: got '$NVM_BIN'"
nvm which 0.12.0 || die "v0.0.20 not found"
NVM_BIN="$(nvm which 0.12.0)"
[ "_$NVM_BIN" = "_$(nvm_version_path v0.12.0)/bin/node" ] \
|| die "'nvm which 0.12.0' did not contain the correct path: got '$NVM_BIN'"
nvm which 0.0.20 | grep "$NVM_DIR/v0.0.20/bin/node" > /dev/null
if [ $? -ne 0 ]; then
die '"nvm which 0.0.2" did not contain the correct path'
fi

2
test/fast/Listing paths/Running "nvm which foo" should return a nonzero exit code when not found
View File

@ -3,4 +3,4 @@
. ../../../nvm.sh . ../../../nvm.sh
nvm which nonexistent_version nvm which nonexistent_version
[ "$?" = "1" ] [ "_$?" = "_1" ]

1
test/fast/Listing paths/teardown
View File

@ -1,2 +1,3 @@
rmdir ../../../v0.0.2 >/dev/null 2>&1 rmdir ../../../v0.0.2 >/dev/null 2>&1
rmdir ../../../v0.0.20 >/dev/null 2>&1 rmdir ../../../v0.0.20 >/dev/null 2>&1
rmdir ../../../v0.12.0 >/dev/null 2>&1