Merge pull request #1830 from NoahGorny/simplify-install

simplify install

install.sh

@@ -2,7 +2,7 @@
 # bash-it installer
 
 # Show how to use this installer
-function show_usage() {
+function _bash-it_show_usage() {
 	echo -e "\n$0 : Install bash-it"
 	echo -e "Usage:\n$0 [arguments] \n"
 	echo "Arguments:"
@@ -11,11 +11,12 @@ function show_usage() {
 	echo "--interactive (-i): Interactively choose plugins"
 	echo "--no-modify-config (-n): Do not modify existing config file"
 	echo "--append-to-config (-a): Keep existing config file and append bash-it templates at the end"
+	echo "--overwrite-backup (-f): Overwrite existing backup"
 	exit 0
 }
 
 # enable a thing
-function load_one() {
+function _bash-it_load_one() {
 	file_type=$1
 	file_to_enable=$2
 	mkdir -p "$BASH_IT/${file_type}/enabled"
@@ -29,7 +30,7 @@ function load_one() {
 }
 
 # Interactively enable several things
-function load_some() {
+function _bash-it_load_some() {
 	file_type=$1
 	single_type=$(echo "$file_type" | sed -e "s/aliases$/alias/g" | sed -e "s/plugins$/plugin/g")
 	enable_func="_enable-$single_type"
@@ -56,26 +57,89 @@ function load_some() {
 }
 
 # Back up existing profile
-function backup() {
+function _bash-it_backup() {
 	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"
 }
 
 # Back up existing profile and create new one for bash-it
-function backup_new() {
+function _bash-it_backup_new() {
-	backup
+	_bash-it_backup
 	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"
 }
 
 # Back up existing profile and append bash-it templates at the end
-function backup_append() {
+function _bash-it_backup_append() {
-	backup
+	_bash-it_backup
 	(sed "s|{{BASH_IT}}|$BASH_IT|" "$BASH_IT/template/bash_profile.template.bash" | tail -n +2) >> "$HOME/$CONFIG_FILE"
 	echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m"
 }
 
+function _bash-it_check_for_backup() {
+	if ! [[ -e "$HOME/$BACKUP_FILE" ]]; then
+		return
+	fi
+	echo -e "\033[0;33mBackup file already exists. Make sure to backup your .bashrc before running this installation.\033[0m" >&2
+
+	if ! [[ $overwrite_backup ]]; then
+		while ! [[ $silent ]]; do
+			read -e -n 1 -r -p "Would you like to overwrite the existing backup? This will delete your existing backup file ($HOME/$BACKUP_FILE) [y/N] " RESP
+			case $RESP in
+				[yY])
+					overwrite_backup=true
+					break
+					;;
+				[nN] | "")
+					break
+					;;
+				*)
+					echo -e "\033[91mPlease choose y or n.\033[m"
+					;;
+			esac
+		done
+	fi
+	if ! [[ $overwrite_backup ]]; then
+		echo -e "\033[91mInstallation aborted. Please come back soon!\033[m"
+		if [[ $silent ]]; then
+			echo -e "\033[91mUse \"-f\" flag to force overwrite of backup.\033[m"
+		fi
+		exit 1
+	else
+		echo -e "\033[0;32mOverwriting backup...\033[m"
+	fi
+}
+
+function _bash-it_modify_config_files() {
+	_bash-it_check_for_backup
+
+	if ! [[ $silent ]]; then
+		while ! [[ $append_to_config ]]; do
+			read -e -n 1 -r -p "Would you like to keep your $CONFIG_FILE and append bash-it templates at the end? [y/N] " choice
+			case $choice in
+				[yY])
+					append_to_config=true
+					break
+					;;
+				[nN] | "")
+					break
+					;;
+				*)
+					echo -e "\033[91mPlease choose y or n.\033[m"
+					;;
+			esac
+		done
+	fi
+	if [[ $append_to_config ]]; then
+		# backup/append
+		_bash-it_backup_append
+	else
+		# backup/new by default
+		_bash-it_backup_new
+	fi
+}
+
 for param in "$@"; do
 	shift
 	case "$param" in
@@ -84,23 +148,25 @@ for param in "$@"; do
 		"--interactive") set -- "$@" "-i" ;;
 		"--no-modify-config") set -- "$@" "-n" ;;
 		"--append-to-config") set -- "$@" "-a" ;;
+		"--overwrite-backup") set -- "$@" "-f" ;;
 		*) set -- "$@" "$param" ;;
 	esac
 done
 
 OPTIND=1
-while getopts "hsina" opt; do
+while getopts "hsinaf" opt; do
 	case "$opt" in
 		"h")
-			show_usage
+			_bash-it_show_usage
 			exit 0
 			;;
 		"s") silent=true ;;
 		"i") interactive=true ;;
 		"n") no_modify_config=true ;;
 		"a") append_to_config=true ;;
+		"f") overwrite_backup=true ;;
 		"?")
-			show_usage >&2
+			_bash-it_show_usage >&2
 			exit 1
 			;;
 	esac
@@ -130,48 +196,8 @@ esac
 
 BACKUP_FILE=$CONFIG_FILE.bak
 echo "Installing bash-it"
-if ! [[ $silent ]] && ! [[ $no_modify_config ]]; then
+if ! [[ $no_modify_config ]]; then
-	if [ -e "$HOME/$BACKUP_FILE" ]; then
+	_bash-it_modify_config_files
-		echo -e "\033[0;33mBackup file already exists. Make sure to backup your .bashrc before running this installation.\033[0m" >&2
-		while ! [ $silent ]; do
-			read -e -n 1 -r -p "Would you like to overwrite the existing backup? This will delete your existing backup file ($HOME/$BACKUP_FILE) [y/N] " RESP
-			case $RESP in
-				[yY])
-					break
-					;;
-				[nN] | "")
-					echo -e "\033[91mInstallation aborted. Please come back soon!\033[m"
-					exit 1
-					;;
-				*)
-					echo -e "\033[91mPlease choose y or n.\033[m"
-					;;
-			esac
-		done
-	fi
-
-	while ! [ $append_to_config ]; do
-		read -e -n 1 -r -p "Would you like to keep your $CONFIG_FILE and append bash-it templates at the end? [y/N] " choice
-		case $choice in
-			[yY])
-				backup_append
-				break
-				;;
-			[nN] | "")
-				backup_new
-				break
-				;;
-			*)
-				echo -e "\033[91mPlease choose y or n.\033[m"
-				;;
-		esac
-	done
-elif [[ $append_to_config ]]; then
-	# backup/append
-	backup_append
-elif [[ $silent ]] && ! [[ $no_modify_config ]]; then
-	# backup/new by default
-	backup_new
 fi
 
 # Disable auto-reload in case its enabled
@@ -188,7 +214,7 @@ source "$BASH_IT/lib/helpers.bash"
 if [[ $interactive ]] && ! [[ $silent ]]; then
 	for type in "aliases" "plugins" "completion"; do
 		echo -e "\033[0;32mEnabling $type\033[0m"
-		load_some $type
+		_bash-it_load_some $type
 	done
 else
 	echo ""