Merge pull request Bash-it#810 from knorth55/install-modify-config

[install.sh] add flag not to modify exist config file during installation
BarbUk · Nov 7, 2016 · 2e25aa5 · 2e25aa5
2 parents 383cdd3 + db4449d
commit 2e25aa5
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -20,8 +20,12 @@ The install script can take the following options:
 
 * `--interactive`: Asks the user which aliases, completions and plugins to enable.
 
+* `--no-modify-config`: Do not modify config file (~/.bash_profile or ~/.bashrc).
+
 When run without the `--interactive` switch, Bash-it only enables a sane default set of functionality to keep your shell clean and to avoid issues with missing dependencies. Feel free to enable the tools you want to use after the installation.
 
+When you run without the `--no-modify-config` switch, Bash-it installation automatically modify your existing config file.
+
 **NOTE**: Keep in mind how Bash load its configuration files, `.bash_profile` for login shells (and in Mac OS X in terminal emulators like [Terminal.app](http://www.apple.com/osx/apps/) or [iTerm2](https://www.iterm2.com/)) and `.bashrc` for interactive shells (default mode in most of the GNU/Linux terminal emulators), to ensure that Bash-it is loaded correctly. A good "practice" is sourcing `.bashrc` into `.bash_profile` to keep things working in all the scenarios, to achieve this, you can add this snippet in your `.bash_profile`:
 
 ```

diff --git a/install.sh b/install.sh
@@ -9,6 +9,7 @@ function show_usage() {
   echo "--help (-h): Display this help message"
   echo "--silent (-s): Install default settings without prompting for input";
   echo "--interactive (-i): Interactively choose plugins"
+  echo "--no-modify-config (-n): Do not modify existing config file"
   exit 0;
 }
 
@@ -64,20 +65,22 @@ function backup_new() {
 for param in "$@"; do
   shift
   case "$param" in
-    "--help")        set -- "$@" "-h" ;;
-    "--silent")      set -- "$@" "-s" ;;
-    "--interactive") set -- "$@" "-i" ;;
-    *)               set -- "$@" "$param"
+    "--help")               set -- "$@" "-h" ;;
+    "--silent")             set -- "$@" "-s" ;;
+    "--interactive")        set -- "$@" "-i" ;;
+    "--no-modify-config")   set -- "$@" "-n" ;;
+    *)                      set -- "$@" "$param"
   esac
 done
 
 OPTIND=1
-while getopts "hsi" opt
+while getopts "hsin" opt
 do
   case "$opt" in
   "h") show_usage; exit 0 ;;
   "s") silent=true ;;
   "i") interactive=true ;;
+  "n") no_modify_config=true ;;
   "?") show_usage >&2; exit 1 ;;
   esac
 done
@@ -101,48 +104,48 @@ esac
 
 BACKUP_FILE=$CONFIG_FILE.bak
 echo "Installing bash-it"
-if [ -e "$HOME/$BACKUP_FILE" ]; then
-  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
+if ! [[ $silent ]] && ! [[ $no_modify_config ]]; then
+  if [ -e "$HOME/$BACKUP_FILE" ]; then
+    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 ! [ $silent ]; 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])
+      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" | tail -n +2) >> "$HOME/$CONFIG_FILE"
+      echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m"
       break
       ;;
     [nN]|"")
-      echo -e "\033[91mInstallation aborted. Please come back soon!\033[m"
-      exit 1
+      backup_new
+      break
       ;;
     *)
       echo -e "\033[91mPlease choose y or n.\033[m"
       ;;
     esac
   done
-fi
-
-while ! [ $silent ]; 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])
-    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" | tail -n +2) >> "$HOME/$CONFIG_FILE"
-    echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m"
-    break
-    ;;
-  [nN]|"")
-    backup_new
-    break
-    ;;
-  *)
-    echo -e "\033[91mPlease choose y or n.\033[m"
-    ;;
-  esac
-done
-
-if [ $silent ]; then
+elif [[ $silent ]] && ! [[ $no_modify_config ]]; then
   # backup/new by default
   backup_new
 fi