From 93e84a267654cf88e06e7c8daf086dc2972d6071 Mon Sep 17 00:00:00 2001
From: Ron Korving <rkorving@wizcorp.jp>
Date: Fri, 14 Jun 2013 13:13:33 +0900
Subject: [PATCH] Moved gitless installer into its own file.

---
 install-gitless.sh | 57 ++++++++++++++++++++++++++++++++++++++++++++++
 install.sh         | 17 +++++---------
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100755 install-gitless.sh

diff --git a/install-gitless.sh b/install-gitless.sh
new file mode 100755
index 0000000..91c77ae
--- /dev/null
+++ b/install-gitless.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# an alternative URL that could be used: https://github.com/creationix/nvm/tarball/master
+TARBALL_URL="https://api.github.com/repos/creationix/nvm/tarball"
+NVM_TARGET="$HOME/.nvm"
+
+if [ -d "$NVM_TARGET" ]; then
+  echo "=> NVM is already installed in $NVM_TARGET, trying to update"
+  rm -rf "$NVM_TARGET"
+fi
+
+# Downloading to $NVM_TARGET
+mkdir "$NVM_TARGET"
+pushd "$NVM_TARGET" > /dev/null
+echo -ne "=> "
+curl --silent -L "$TARBALL_URL" | tar -xz --strip-components=1 || exit 1
+echo -n Downloaded
+popd > /dev/null
+
+echo
+
+# Detect profile file, .bash_profile has precedence over .profile
+if [ ! -z "$1" ]; then
+  PROFILE="$1"
+else
+  if [ -f "$HOME/.bash_profile" ]; then
+	PROFILE="$HOME/.bash_profile"
+  elif [ -f "$HOME/.profile" ]; then
+	PROFILE="$HOME/.profile"
+  fi
+fi
+
+SOURCE_STR="[[ -s "$NVM_TARGET/nvm.sh" ]] && . "$NVM_TARGET/nvm.sh"  # This loads NVM"
+
+if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
+  if [ -z $PROFILE ]; then
+	echo "=> Profile not found"
+  else
+	echo "=> Profile $PROFILE not found"
+  fi
+  echo "=> Append the following line to the correct file yourself"
+  echo
+  echo "\t$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"
+fi
+
+echo "=> Close and reopen your terminal to start using NVM"
diff --git a/install.sh b/install.sh
index 91c77ae..ab8cca4 100755
--- a/install.sh
+++ b/install.sh
@@ -1,21 +1,16 @@
 #!/bin/bash
 
-# an alternative URL that could be used: https://github.com/creationix/nvm/tarball/master
-TARBALL_URL="https://api.github.com/repos/creationix/nvm/tarball"
 NVM_TARGET="$HOME/.nvm"
 
 if [ -d "$NVM_TARGET" ]; then
   echo "=> NVM is already installed in $NVM_TARGET, trying to update"
-  rm -rf "$NVM_TARGET"
+  echo -ne "\r=> "
+  cd $NVM_TARGET && git pull
+  exit
 fi
 
-# Downloading to $NVM_TARGET
-mkdir "$NVM_TARGET"
-pushd "$NVM_TARGET" > /dev/null
-echo -ne "=> "
-curl --silent -L "$TARBALL_URL" | tar -xz --strip-components=1 || exit 1
-echo -n Downloaded
-popd > /dev/null
+# Cloning to $NVM_TARGET
+git clone https://github.com/creationix/nvm.git $NVM_TARGET
 
 echo
 
@@ -48,7 +43,7 @@ fi
 
 if ! grep -qc 'nvm.sh' $PROFILE; then
   echo "=> Appending source string to $PROFILE"
-  echo "" >> "$PROFILE"
+  echo "\n" >> "$PROFILE"
   echo $SOURCE_STR >> "$PROFILE"
 else
   echo "=> Source string already in $PROFILE"