From 0774058cf1f036838dc6250f93c46dbb92c5648a Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Sun, 22 Dec 2013 17:46:26 +0100
Subject: [PATCH 1/7] replaced fatalExit function for 'inline' exit exit on
 errors (set -e) simplified if for NVM_DIR and NVM_SOURCE, corrected
 indentation

---
 install-gitless.sh | 17 ++++++++---------
 install.sh         |  2 ++
 2 files changed, 10 insertions(+), 9 deletions(-)

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

From 349dfb9826949b5f9c0551879c5993b262b5ea38 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Sun, 22 Dec 2013 17:48:10 +0100
Subject: [PATCH 2/7] don't make use of pushd and popd as they are not
 universal

---
 install-gitless.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install-gitless.sh b/install-gitless.sh
index 2300734..81eda31 100755
--- a/install-gitless.sh
+++ b/install-gitless.sh
@@ -12,13 +12,13 @@ fi
 
 # Downloading to $NVM_DIR
 mkdir -p "$NVM_DIR"
-pushd "$NVM_DIR" > /dev/null
-echo -ne "=> Downloading... "
-curl --silent "$NVM_SOURCE" -o nvm.sh || {
+echo -e "\r=> Downloading... \c"
+curl --silent "$NVM_SOURCE" -o "$NVM_DIR/nvm.sh" || {
   echo "Failed downloading $NVM_SOURCE" && exit 1
 }
 echo "Downloaded"
-popd > /dev/null
+
+echo
 
 # Detect profile file, .bash_profile has precedence over .profile
 if [ ! -z "$1" ]; then

From cb3d8bf99c528e240885ebd3e8493c0e7fa1aebf Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Sun, 22 Dec 2013 18:23:59 +0100
Subject: [PATCH 3/7] made NVM_DIR and NVM_SOURCE configurable using
 environment variables

---
 install.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index d565d80..5f30bbb 100755
--- a/install.sh
+++ b/install.sh
@@ -2,7 +2,13 @@
 
 set -e
 
-NVM_DIR="$HOME/.nvm"
+if [ ! "$NVM_SOURCE" ]; then
+  NVM_SOURCE="https://github.com/creationix/nvm.git"
+fi
+
+if [ ! "$NVM_DIR" ]; then
+  NVM_DIR="$HOME/.nvm"
+fi
 
 if ! hash git 2>/dev/null; then
   echo >&2 "You need to install git - visit http://git-scm.com/downloads"
@@ -12,11 +18,12 @@ fi
 
 if [ -d "$NVM_DIR" ]; then
   echo "=> NVM is already installed in $NVM_DIR, trying to update"
-  echo -ne "\r=> "
-  cd $NVM_DIR && git pull
+  echo -e "\r=> \c"
+  cd "$NVM_DIR" && git pull
 else
   # Cloning to $NVM_DIR
-  git clone https://github.com/creationix/nvm.git $NVM_DIR  
+  mkdir -p "$NVM_DIR"
+  git clone "$NVM_SOURCE" "$NVM_DIR"
 fi
 
 echo

From 365167a4a3eefe22fdcc22f7d39e8fa412f575b0 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Sun, 22 Dec 2013 17:56:42 +0100
Subject: [PATCH 4/7] replaced undocumented option for specifying the profile
 as first argument to specifying it as a environment variable (eg:
 PROFILE=~/.myprofile ./install-gitless.sh) also; fixed indentation and added
 .zshrc as possible profile

---
 install-gitless.sh | 12 ++++++------
 install.sh         | 12 +++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/install-gitless.sh b/install-gitless.sh
index 81eda31..e322e56 100755
--- a/install-gitless.sh
+++ b/install-gitless.sh
@@ -20,14 +20,14 @@ echo "Downloaded"
 
 echo
 
-# Detect profile file, .bash_profile has precedence over .profile
-if [ ! -z "$1" ]; then
-  PROFILE="$1"
-else
+# Detect profile file if not specified as environment variable (eg: PROFILE=~/.myprofile).
+if [ ! "$PROFILE" ]; then
   if [ -f "$HOME/.bash_profile" ]; then
-	PROFILE="$HOME/.bash_profile"
+    PROFILE="$HOME/.bash_profile"
+  elif [ -f "$HOME/.zshrc" ]; then
+    PROFILE="$HOME/.zshrc"
   elif [ -f "$HOME/.profile" ]; then
-	PROFILE="$HOME/.profile"
+    PROFILE="$HOME/.profile"
   fi
 fi
 
diff --git a/install.sh b/install.sh
index 5f30bbb..59e7436 100755
--- a/install.sh
+++ b/install.sh
@@ -28,16 +28,14 @@ fi
 
 echo
 
-# Detect profile file, .bash_profile has precedence over .profile
-if [ ! -z "$1" ]; then
-  PROFILE="$1"
-else
+# Detect profile file if not specified as environment variable (eg: PROFILE=~/.myprofile).
+if [ ! "$PROFILE" ]; then
   if [ -f "$HOME/.bash_profile" ]; then
-	PROFILE="$HOME/.bash_profile"
+    PROFILE="$HOME/.bash_profile"
   elif [ -f "$HOME/.zshrc" ]; then
-  	PROFILE="$HOME/.zshrc"
+    PROFILE="$HOME/.zshrc"
   elif [ -f "$HOME/.profile" ]; then
-	PROFILE="$HOME/.profile"
+    PROFILE="$HOME/.profile"
   fi
 fi
 

From ca9bcb8ce41533378a7971d8e576210007b58956 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Sun, 22 Dec 2013 18:03:06 +0100
Subject: [PATCH 5/7] Updated source string, use hard path as NVM is not always
 installed in `$HOME/.nvm`

---
 install-gitless.sh | 2 +-
 install.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install-gitless.sh b/install-gitless.sh
index e322e56..aaaf905 100755
--- a/install-gitless.sh
+++ b/install-gitless.sh
@@ -31,7 +31,7 @@ if [ ! "$PROFILE" ]; then
   fi
 fi
 
-SOURCE_STR="[[ -s "$NVM_DIR/nvm.sh" ]] && . "$NVM_DIR/nvm.sh"  # This loads NVM"
+SOURCE_STR="[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"  # This loads NVM"
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then
diff --git a/install.sh b/install.sh
index 59e7436..55cc7ec 100755
--- a/install.sh
+++ b/install.sh
@@ -39,7 +39,7 @@ if [ ! "$PROFILE" ]; then
   fi
 fi
 
-SOURCE_STR="[ -s \$HOME/.nvm/nvm.sh ] && . \$HOME/.nvm/nvm.sh  # This loads NVM"
+SOURCE_STR="[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"  # This loads NVM"
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then

From a5a58af074fffb32dff5534d588886fe504bf482 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Sun, 22 Dec 2013 18:05:20 +0100
Subject: [PATCH 6/7] updated output without special characters (tab; \t) Omit
 duplicate 'finish line' normalized indentation

---
 install-gitless.sh | 27 ++++++++++++++-------------
 install.sh         | 33 ++++++++++++++-------------------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/install-gitless.sh b/install-gitless.sh
index aaaf905..8a3a27c 100755
--- a/install-gitless.sh
+++ b/install-gitless.sh
@@ -35,24 +35,25 @@ SOURCE_STR="[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"  # This loads NV
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then
-	echo "=> Profile not found"
+    echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
+    echo "=> Create one of them and run this script again"
   else
-	echo "=> Profile $PROFILE not found"
+    echo "=> Profile $PROFILE not found"
+    echo "=> Create it (touch $PROFILE) and run this script again"
   fi
-  echo "=> Append the following line to the correct file yourself"
+  echo "   OR"
+  echo "=> Append the following line to the correct file yourself:"
   echo
-  echo "\t$SOURCE_STR"
+  echo "   $SOURCE_STR"
   echo
-  echo "=> Close and reopen your terminal to start using NVM"
-  exit
-fi
-
-if ! grep -qc 'nvm.sh' $PROFILE; then
-  echo "=> Appending source string to $PROFILE"
-  echo "" >> "$PROFILE"
-  echo $SOURCE_STR >> "$PROFILE"
 else
-  echo "=> Source string already in $PROFILE"
+  if ! grep -qc 'nvm.sh' $PROFILE; then
+    echo "=> Appending source string to $PROFILE"
+    echo "" >> "$PROFILE"
+    echo $SOURCE_STR >> "$PROFILE"
+  else
+    echo "=> Source string already in $PROFILE"
+  fi
 fi
 
 echo "=> Close and reopen your terminal to start using NVM"
diff --git a/install.sh b/install.sh
index 55cc7ec..94cb634 100755
--- a/install.sh
+++ b/install.sh
@@ -43,30 +43,25 @@ SOURCE_STR="[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"  # This loads NV
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then
-	echo "=> Profile not found. Tried $HOME/.bash_profile and $HOME/.profile"
+    echo "=> Profile not found. Tried ~/.bash_profile ~/.zshrc and ~/.profile."
+    echo "=> Create one of them and run this script again"
   else
-	echo "=> Profile $PROFILE not found"
+    echo "=> Profile $PROFILE not found"
+    echo "=> Create it (touch $PROFILE) and run this script again"
   fi
-  echo "=> Run this script again after running the following:"
+  echo "   OR"
+  echo "=> Append the following line to the correct file yourself:"
   echo
-  echo "\ttouch $HOME/.profile"
+  echo "   $SOURCE_STR"
   echo
-  echo "-- OR --"
-  echo
-  echo "=> Append the following line to the correct file yourself"
-  echo
-  echo "\t$SOURCE_STR"
-  echo
-  echo "=> Close and reopen your terminal afterwards to start using NVM"
-  exit
-fi
-
-if ! grep -qc 'nvm.sh' $PROFILE; then
-  echo "=> Appending source string to $PROFILE"
-  echo "" >> "$PROFILE"
-  echo $SOURCE_STR >> "$PROFILE"
 else
-  echo "=> Source string already in $PROFILE"
+  if ! grep -qc 'nvm.sh' $PROFILE; then
+    echo "=> Appending source string to $PROFILE"
+    echo "" >> "$PROFILE"
+    echo $SOURCE_STR >> "$PROFILE"
+  else
+    echo "=> Source string already in $PROFILE"
+  fi
 fi
 
 echo "=> Close and reopen your terminal to start using NVM"

From 451f5a54aa762c79b7afbfdc97a943065cf90bd9 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Sun, 22 Dec 2013 18:37:08 +0100
Subject: [PATCH 7/7] updated README

---
 README.markdown | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index eba57e1..184928d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -14,8 +14,11 @@ or Wget:
 
     wget -qO- https://raw.github.com/creationix/nvm/master/install.sh | sh
 
-<sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile` or `~/.profile`).</sub>
+<sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc` or `~/.profile`).</sub>
 
+You can customize the install source, directory and profile using the `NVM_SOURCE`, `NVM_DIR` and `NVM_PROFILE` variables. Eg: `curl ... | NVM_DIR=/usr/local/nvm sh` for a global install.
+
+<sub>*NB. There is also a [gitless installer](https://github.com/creationix/nvm/blob/master/install-gitless.sh) available, which accepts the same variables as the default installer.*</sub>
 
 ### Manual install