Merge pull request #370 from jpadilla/patch-1

Detect if curl or wget is installed to download NVM_SOURCE
master
Jordan Harband 2014-03-13 14:26:44 -07:00
commit 192e381971
1 changed files with 18 additions and 9 deletions

View File

@ -1,23 +1,32 @@
#!/bin/bash #!/bin/bash
function fatalExit (){ fatalExit (){
echo "$@" && exit 1; echo "$@" && exit 1;
} }
# an alternative URL that could be used: https://github.com/creationix/nvm/tarball/master # an alternative URL that could be used: https://github.com/creationix/nvm/tarball/master
if [ "$NVM_SOURCE" = "" ]; then if [ "$NVM_SOURCE" = "" ]; then
NVM_SOURCE="https://raw.github.com/creationix/nvm/master/nvm.sh" NVM_SOURCE="https://raw.github.com/creationix/nvm/master/nvm.sh"
fi fi
if [ "$NVM_DIR" = "" ]; then if [ "$NVM_DIR" = "" ]; then
NVM_DIR="$HOME/.nvm" NVM_DIR="$HOME/.nvm"
fi fi
# Downloading to $NVM_DIR # Downloading to $NVM_DIR
mkdir -p "$NVM_DIR" mkdir -p "$NVM_DIR"
pushd "$NVM_DIR" > /dev/null pushd "$NVM_DIR" > /dev/null
echo -ne "=> Downloading... " echo -ne "=> Downloading... "
curl --silent "$NVM_SOURCE" -o nvm.sh || fatalExit "Failed";
# Detect if curl or wget is installed to download NVM_SOURCE
if type curl > /dev/null 2>&1; then
curl --silent "$NVM_SOURCE" -o nvm.sh || fatalExit "Failed";
elif type wget > /dev/null 2>&1; then
wget --quiet "$NVM_SOURCE" -O nvm.sh || fatalExit "Failed";
else
fatalExit "Must have curl or wget to install nvm";
fi
echo "Downloaded" echo "Downloaded"
popd > /dev/null popd > /dev/null
@ -26,9 +35,9 @@ if [ ! -z "$1" ]; then
PROFILE="$1" PROFILE="$1"
else else
if [ -f "$HOME/.bash_profile" ]; then if [ -f "$HOME/.bash_profile" ]; then
PROFILE="$HOME/.bash_profile" PROFILE="$HOME/.bash_profile"
elif [ -f "$HOME/.profile" ]; then elif [ -f "$HOME/.profile" ]; then
PROFILE="$HOME/.profile" PROFILE="$HOME/.profile"
fi fi
fi fi
@ -36,9 +45,9 @@ SOURCE_STR="[[ -s "$NVM_DIR/nvm.sh" ]] && . "$NVM_DIR/nvm.sh" # This loads NVM"
if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
if [ -z $PROFILE ]; then if [ -z $PROFILE ]; then
echo "=> Profile not found" echo "=> Profile not found"
else else
echo "=> Profile $PROFILE not found" echo "=> Profile $PROFILE not found"
fi fi
echo "=> Append the following line to the correct file yourself" echo "=> Append the following line to the correct file yourself"
echo echo