replaced fatalExit function for 'inline' exit

exit on errors (set -e)
simplified if for NVM_DIR and NVM_SOURCE, corrected indentation
This commit is contained in:
Koen Punt 2013-12-22 17:46:26 +01:00
parent 5c7996da5b
commit 0774058cf1
2 changed files with 10 additions and 9 deletions

View File

@ -1,23 +1,22 @@
#!/bin/bash #!/bin/bash
function fatalExit (){ set -e
echo "$@" && exit 1;
}
# 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"; curl --silent "$NVM_SOURCE" -o nvm.sh || {
echo "Failed downloading $NVM_SOURCE" && exit 1
}
echo "Downloaded" echo "Downloaded"
popd > /dev/null popd > /dev/null

View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
NVM_DIR="$HOME/.nvm" NVM_DIR="$HOME/.nvm"
if ! hash git 2>/dev/null; then if ! hash git 2>/dev/null; then