Merge pull request #104 from prozacgod/master

NVM "need curl to proceed"
master
Tim Caswell 2012-02-27 10:47:29 -08:00
commit dcd29296e9
1 changed files with 4 additions and 7 deletions

11
nvm.sh
View File

@ -10,12 +10,6 @@ if [ ! -d "$NVM_DIR" ]; then
export NVM_DIR=$(cd $(dirname ${BASH_SOURCE[0]:-$0}); pwd) export NVM_DIR=$(cd $(dirname ${BASH_SOURCE[0]:-$0}); pwd)
fi fi
# Emulate curl with wget, if necessary
if [ ! `which curl` ]; then
NOCURL='nocurl'
curl() { echo 'Need curl to proceed.' >&2; }
fi
# Expand a version using the version cache # Expand a version using the version cache
nvm_version() nvm_version()
{ {
@ -106,11 +100,14 @@ nvm()
echo echo
;; ;;
"install" ) "install" )
if [ ! `which curl` ]; then
echo 'NVM Needs curl to proceed.' >&2;
fi
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
nvm help nvm help
return return
fi fi
[ "$NOCURL" ] && curl && return
VERSION=`nvm_version $2` VERSION=`nvm_version $2`
[ -d "$NVM_DIR/$VERSION" ] && echo "$VERSION is already installed." && return [ -d "$NVM_DIR/$VERSION" ] && echo "$VERSION is already installed." && return