From 49afeb707e385bae2368acdc22d0bd271ae2a1c8 Mon Sep 17 00:00:00 2001
From: ravenhall <nathan.e.waddell@gmail.com>
Date: Tue, 31 May 2016 18:45:36 -0500
Subject: [PATCH] Added forgotten -e and moved funcs to the top to prevent
 scoping issue

---
 install.sh | 101 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/install.sh b/install.sh
index ac53675a..e6518042 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # bash-it installer
-show_usage() {
+
+# Show how to use this installer
+function show_usage() {
   echo -e "\n$0 : Install bash-it"
   echo -e "Usage:\n$0 [arguments] \n"
   echo "Arguments:"
@@ -10,6 +12,55 @@ show_usage() {
   exit 0;
 }
 
+# enable a thing
+function load_one() {
+  file_type=$1
+  file_to_enable=$2
+  mkdir -p "$BASH_IT/${file_type}/enabled"
+
+  dest="${BASH_IT}/${file_type}/enabled/${file_to_enable}"
+  if [ ! -e "${dest}" ]; then
+    ln -sf "../available/${file_to_enable}" "${dest}"
+  else
+    echo "File ${dest} exists, skipping"
+  fi
+}
+
+# Interactively enable several things
+function load_some() {
+  file_type=$1
+  [ -d "$BASH_IT/$file_type/enabled" ] || mkdir "$BASH_IT/$file_type/enabled"
+  for path in `ls $BASH_IT/${file_type}/available/[^_]*`
+  do
+    file_name=$(basename "$path")
+    while true
+    do
+      read -e -n 1 -p "Would you like to enable the ${file_name%%.*} $file_type? [y/N] " RESP
+      case $RESP in
+      [yY])
+        ln -s "../available/${file_name}" "$BASH_IT/$file_type/enabled"
+        break
+        ;;
+      [nN]|"")
+        break
+        ;;
+      *)
+        echo -e "\033[91mPlease choose y or n.\033[m"
+        ;;
+      esac
+    done
+  done
+}
+
+# Back up existing profile and create new one for bash-it
+function backup_new() {
+  test -w "$HOME/$CONFIG_FILE" &&
+  cp -aL "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.bak" &&
+  echo -e "\033[0;32mYour original $CONFIG_FILE has been backed up to $CONFIG_FILE.bak\033[0m"
+  sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" > "$HOME/$CONFIG_FILE"
+  echo -e "\033[0;32mCopied the template $CONFIG_FILE into ~/$CONFIG_FILE, edit this file to customize bash-it\033[0m"
+}
+
 for param in "$@"; do
   shift
   case "$param" in
@@ -33,7 +84,7 @@ done
 shift $(expr $OPTIND - 1)
 
 if [[ $silent ]] && [[ $interactive ]]; then
-  echo "\033[91mOptions --silent and --interactive are mutually exclusive. Please choose one or the other.\033[m"
+  echo -e "\033[91mOptions --silent and --interactive are mutually exclusive. Please choose one or the other.\033[m"
   exit 1;
 fi
 
@@ -96,52 +147,6 @@ if [ $silent ]; then
   backup_new
 fi
 
-function load_one() {
-  file_type=$1
-  file_to_enable=$2
-  mkdir -p "$BASH_IT/${file_type}/enabled"
-
-  dest="${BASH_IT}/${file_type}/enabled/${file_to_enable}"
-  if [ ! -e "${dest}" ]; then
-    ln -sf "../available/${file_to_enable}" "${dest}"
-  else
-    echo "File ${dest} exists, skipping"
-  fi
-}
-
-function load_some() {
-  file_type=$1
-  [ -d "$BASH_IT/$file_type/enabled" ] || mkdir "$BASH_IT/$file_type/enabled"
-  for path in `ls $BASH_IT/${file_type}/available/[^_]*`
-  do
-    file_name=$(basename "$path")
-    while true
-    do
-      read -e -n 1 -p "Would you like to enable the ${file_name%%.*} $file_type? [y/N] " RESP
-      case $RESP in
-      [yY])
-        ln -s "../available/${file_name}" "$BASH_IT/$file_type/enabled"
-        break
-        ;;
-      [nN]|"")
-        break
-        ;;
-      *)
-        echo -e "\033[91mPlease choose y or n.\033[m"
-        ;;
-      esac
-    done
-  done
-}
-
-function backup_new() {
-  test -w "$HOME/$CONFIG_FILE" &&
-  cp -aL "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.bak" &&
-  echo -e "\033[0;32mYour original $CONFIG_FILE has been backed up to $CONFIG_FILE.bak\033[0m"
-  sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" > "$HOME/$CONFIG_FILE"
-  echo -e "\033[0;32mCopied the template $CONFIG_FILE into ~/$CONFIG_FILE, edit this file to customize bash-it\033[0m"
-}
-
 if [[ $interactive ]] && ! [[ $silent ]] ;
 then
   for type in "aliases" "plugins" "completion"