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

replaced fatalExit function for 'inline' exit 

exit on errors (set -e)
simplified if for NVM_DIR and NVM_SOURCE, corrected indentation
master
Koen Punt 2013-12-22 17:46:26 +01:00
parent 7c45d62b37
commit 0787a55999
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install-gitless.sh
View File

@ -1,15 +1,16 @@
#!/bin/bash #!/bin/bash
set -e
fatalExit (){ fatalExit (){
echo "$@" && exit 1; 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
@ -20,9 +21,9 @@ echo -ne "=> Downloading... "
# Detect if curl or wget is installed to download NVM_SOURCE # Detect if curl or wget is installed to download NVM_SOURCE
if type curl > /dev/null 2>&1; then if type curl > /dev/null 2>&1; then
curl --silent "$NVM_SOURCE" -o nvm.sh || fatalExit "Failed"; curl --silent "$NVM_SOURCE" -o nvm.sh || fatalExit "Failed downloading $NVM_SOURCE";
elif type wget > /dev/null 2>&1; then elif type wget > /dev/null 2>&1; then
wget --quiet "$NVM_SOURCE" -O nvm.sh || fatalExit "Failed"; wget --quiet "$NVM_SOURCE" -O nvm.sh || fatalExit "Failed downloading $NVM_SOURCE";
else else
fatalExit "Must have curl or wget to install nvm"; fatalExit "Must have curl or wget to install nvm";
fi fi

2
install.sh
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