From 8c8bf1204c5217137e56f8df4257c9c76b7747fe Mon Sep 17 00:00:00 2001
From: Owen Smith <owen@udacity.com>
Date: Tue, 5 Jul 2016 19:22:52 -0700
Subject: [PATCH] [Fix] install should not exit after successful git clone

Fixes #1146 by grouping the commands that handle the error.

I also removed a subshell wrapper from a similar set of lines right
above. It looks to me like that is no longer necessary.
---
 install.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index fc0cdf3..364b923 100755
--- a/install.sh
+++ b/install.sh
@@ -69,16 +69,19 @@ install_nvm_from_git() {
   if [ -d "$INSTALL_DIR/.git" ]; then
     echo "=> nvm is already installed in $INSTALL_DIR, trying to update using git"
     printf "\r=> "
-    (command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" fetch 2> /dev/null || {
-      echo >&2 "Failed to update nvm, run 'git fetch' in $INSTALL_DIR yourself." && exit 1
-    })
+    command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" fetch 2> /dev/null || {
+      echo >&2 "Failed to update nvm, run 'git fetch' in $INSTALL_DIR yourself."
+      exit 1
+    }
   else
     # Cloning to $NVM_DIR
     echo "=> Downloading nvm from git to '$INSTALL_DIR'"
     printf "\r=> "
     mkdir -p "$INSTALL_DIR"
-    command git clone "$(nvm_source)" "$INSTALL_DIR" \
-      || echo >&2 "Failed to clone nvm repo. Please report this!" && exit 1
+    command git clone "$(nvm_source)" "$INSTALL_DIR" || {
+      echo >&2 "Failed to clone nvm repo. Please report this!"
+      exit 1
+    }
   fi
   command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" checkout --quiet "$(nvm_latest_version)"
   if [ ! -z "$(command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" show-ref refs/heads/master)" ]; then