From d5bb072375f6c8e694cee50cfce98533a1d82e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 16 Jun 2016 20:52:58 +0200
Subject: [PATCH] installer: extract most code into functions

---
 tools/install.sh | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 5293641b..e877b602 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -43,22 +43,7 @@ setup_color() {
 	fi
 }
 
-main() {
-	setup_color
-
-	if ! command_exists zsh; then
-		echo "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!"
-		exit 1
-	fi
-
-	if [ -d "$ZSH" ]; then
-		cat <<-EOF
-			${YELLOW}You already have Oh My Zsh installed.${NORMAL}
-			You'll need to remove $ZSH if you want to re-install.
-		EOF
-		exit 1
-	fi
-
+setup_ohmyzsh() {
 	# Prevent the cloned repository from having insecure permissions. Failing to do
 	# so causes compinit() calls to fail with "command not found: compdef" errors
 	# for users with insecure umasks (e.g., "002", allowing group writability). Note
@@ -85,11 +70,13 @@ main() {
 		echo "Error: git clone of oh-my-zsh repo failed"
 		exit 1
 	}
+}
 
+setup_zshrc() {
 	echo "${BLUE}Looking for an existing zsh config...${NORMAL}"
 	if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
 		echo "${YELLOW}Found ~/.zshrc.${GREEN} Backing up to ~/.zshrc.pre-oh-my-zsh.${NORMAL}"
-		mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
+		mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh
 	fi
 
 	echo "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc.${NORMAL}"
@@ -100,6 +87,7 @@ main() {
 	" ~/.zshrc > ~/.zshrc-omztemp
 	mv -f ~/.zshrc-omztemp ~/.zshrc
 
+setup_shell() {
 	# If this user's login shell is not already "zsh", attempt to switch.
 	TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
 	if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
@@ -115,6 +103,29 @@ main() {
 			EOF
 		fi
 	fi
+}
+
+main() {
+	setup_color
+
+	if ! command_exists zsh; then
+		echo "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!"
+		exit 1
+	fi
+
+	if [ -d "$ZSH" ]; then
+		cat <<-EOF
+			${YELLOW}You already have Oh My Zsh installed.${NORMAL}
+			You'll need to remove $ZSH if you want to reinstall.
+		EOF
+		exit 1
+	fi
+
+	setup_ohmyzsh
+
+	setup_zshrc
+
+	setup_shell
 
 	printf $GREEN
 	cat <<-'EOF'