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

Merge pull request #374 from koenpunt/fix-tests 

Fix NVM_DIR discovery
master
Jordan Harband 2014-03-21 09:27:13 -07:00
parent cebda7d35a 4a9a15c404
commit 625e54880f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nvm.sh
View File

@ -5,6 +5,8 @@
# Implemented by Tim Caswell <tim@creationix.com> # Implemented by Tim Caswell <tim@creationix.com>
# with much bash help from Matthew Ranney # with much bash help from Matthew Ranney
SCRIPT_SOURCE="$_"
nvm_has() { nvm_has() {
type "$1" > /dev/null 2>&1 type "$1" > /dev/null 2>&1
return $? return $?
@ -17,14 +19,15 @@ if nvm_has "unsetopt"; then
NVM_CD_FLAGS="-q" NVM_CD_FLAGS="-q"
fi fi
# Auto detect the NVM_DIR # Auto detect the NVM_DIR when not set
if [ ! -d "$NVM_DIR" ]; then if [ -z "$NVM_DIR" ]; then
if [ -n "$BASH_SOURCE" ]; then if [ -n "$BASH_SOURCE" ]; then
export NVM_DIR=$(cd $NVM_CD_FLAGS $(dirname ${BASH_SOURCE[0]:-$0}) > /dev/null && pwd) SCRIPT_SOURCE="${BASH_SOURCE[0]}"
else
export NVM_DIR=$HOME/.nvm
fi fi
export NVM_DIR=$(cd $NVM_CD_FLAGS $(dirname "${SCRIPT_SOURCE:-$0}") > /dev/null && pwd)
fi fi
unset SCRIPT_SOURCE 2> /dev/null
# Setup mirror location if not already set # Setup mirror location if not already set
if [ -z "$NVM_NODEJS_ORG_MIRROR" ]; then if [ -z "$NVM_NODEJS_ORG_MIRROR" ]; then