diff --git a/install-gitless.sh b/install-gitless.sh index d2ee6e6..2300734 100755 --- a/install-gitless.sh +++ b/install-gitless.sh @@ -1,23 +1,22 @@ #!/bin/bash -function fatalExit (){ - echo "$@" && exit 1; -} +set -e -# an alternative URL that could be used: https://github.com/creationix/nvm/tarball/master -if [ "$NVM_SOURCE" == "" ]; then - NVM_SOURCE="https://raw.github.com/creationix/nvm/master/nvm.sh" +if [ ! "$NVM_SOURCE" ]; then + NVM_SOURCE="https://raw.github.com/creationix/nvm/master/nvm.sh" fi -if [ "$NVM_DIR" == "" ]; then - NVM_DIR="$HOME/.nvm" +if [ ! "$NVM_DIR" ]; then + NVM_DIR="$HOME/.nvm" fi # Downloading to $NVM_DIR mkdir -p "$NVM_DIR" pushd "$NVM_DIR" > /dev/null 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" popd > /dev/null diff --git a/install.sh b/install.sh index 8117dca..d565d80 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + NVM_DIR="$HOME/.nvm" if ! hash git 2>/dev/null; then