Updated install script and made patch folder more organized

install.sh

@@ -1,92 +1,69 @@
 #!/bin/bash
-# TODO: Add eclim/eclipse installer
+
-while true; do
+dotfiles="$HOME/$1"
-  read -p "Do you want to make symlinks? " yn
+
+# Show help
+function show_help {
+  echo "Specify directory";
+}
+
+# Ask user
+function ask {
+  while true; do
+    read -p "$1 [Y/n] " yn
     case $yn in
-    [Yy]* ) if [ ! -f ~/.tmux.conf ]; then ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf; fi
+      * ) $2; break;;
-      if [ ! -f ~/.zshrc ]; then ln -s ~/.dotfiles/zshrc ~/.zshrc; fi
-      if [ ! -f ~/.vimrc ]; then ln -s ~/.dotfiles/vimrc ~/.vimrc; fi
-      if [ ! -d ~/.vim ]; then ln -s ~/.dotfiles/vim ~/.vim; fi
-      if [ ! -f ~/.gitignore ]; then ln -s ~/.dotfiles/gitignore ~/.gitignore; fi
-      if [ ! -f ~/.yaourtrc ]; then ln -s ~/.dotfiles/yaourtrc ~/.yaourtrc; fi
-      echo "Done...";
-      break;;
       [Nn]* ) break;;
-  * ) echo "Please answer yes or no.";;
+    esac
-esac
+  done
-done
+}
 
-# while true; do
+# Update submodules
-#   read -p "Do you wish to install gnome-terminal-colors-solarized? (requires dconf-cli) " yn
+function submodule {
-#   case $yn in
+  git submodule update --init --recursive
-#     [Yy]* ) cd ..; 
+}
-#       git clone https://github.com/Anthony25/gnome-terminal-colors-solarized.git;
+# Apply patches
-#       cd gnome-terminal-colors-solarized;
+function patch {
-#       ./install.sh;
+  cd $dotfiles/oh-my-zsh
-#       cd ..;
+  git am $dotfiles/patches/oh-my-zsh/*.patch
-#       rm -rf gnome-terminal-colors-solarized;
+}
-#       cd .dotfiles;
-#       echo "Done...";
-#       break;;
-#     [Nn]* ) break;;
-#   * ) echo "Please answer yes or no.";;
-# esac
-# done
 
-while true; do
+# Comple YouCompleteMe
-  read -p "Do you wish to update all submodules? " yn
+function ycm {
-  case $yn in
+  $dotfiles/vim/bundle/YouCompleteMe/install.sh
-    [Yy]* ) git submodule update --init --recursive;
+}
-      echo "Done...";
-      break;;
-    [Nn]* ) break;;
-  * ) echo "Please answer yes or no.";;
-esac
-done
 
-while true; do
+# Install tmux-vim-select-pane
-  read -p "Do you wish to compile YCM? " yn
+function tvpane {
-  case $yn in
+  sudo curl -fsSL https://raw.github.com/mislav/dotfiles/1500cd2/bin/tmux-vim-select-pane -o /usr/local/bin/tmux-vim-select-pane
-    [Yy]* ) ./vim/bundle/YouCompleteMe/install.sh;
+  sudo chmod +x /usr/local/bin/tmux-vim-select-pane
-      echo "Done...";
+}
-      break;;
-    [Nn]* ) break;;
-  * ) echo "Please answer yes or no.";;
-esac
-done
 
-# while true; do
+# Install fonts
-#   read -p "Do you wish to install source code pro with powerline? " yn
+function fonts {
-#   case $yn in
+  curl -fsSL https://github.com/Lokaltog/powerline-fonts/raw/master/SourceCodePro/Sauce%20Code%20Powerline%20Regular.otf -o "$HOME/.fonts/Sauce Code Powerline Regular.otf"
-#     [Yy]* )	ssudo curl -fsSL https://github.com/Lokaltog/powerline-fonts/raw/master/SourceCodePro/Sauce%20Code%20Powerline%20Regular.otf -o /usr/local/bin/tmux-vim-select-pane;      
+}
-#       echo "Done...";
-#       break;;
-#     [Nn]* ) break;;
-#   * ) echo "Please answer yes or no.";;
-# esac
-# done
-#
-# while true; do
-#   read -p "Do you wish to install tmux-vim-select-pane? " yn
-#   case $yn in
-#     [Yy]* )	sudo curl -fsSL https://raw.github.com/mislav/dotfiles/1500cd2/bin/tmux-vim-select-pane -o /usr/local/bin/tmux-vim-select-pane;
-#       sudo chmod +x /usr/local/bin/tmux-vim-select-pane;
-#       echo "Done...";
-#       break;;
-#     [Nn]* ) break;;
-#   * ) echo "Please answer yes or no.";;
-# esac
-# done
-#
-# while true; do
-#   read -p "Do you wish to install CTags? " yn
-#   case $yn in
-#     [Yy]* )	sudo apt-get install exuberant-ctags;
-#       echo "Done...";
-#       break;;
-#     [Nn]* ) break;;
-#   * ) echo "Please answer yes or no.";;
-# esac
-# done
 
-echo "Done installing...";
+# Setup symlinks to config files
+function symlink {
+  if [ ! -f ~/.tmux.conf ]; then ln -s $dotfiles/tmux.conf ~/.tmux.conf; fi
+  if [ ! -f ~/.zshrc ]; then ln -s $dotfiles/zshrc ~/.zshrc; fi
+  if [ ! -f ~/.vimrc ]; then ln -s $dotfiles/vimrc ~/.vimrc; fi
+  if [ ! -f ~/.yaourtrc ]; then ln -s $dotfiles/yaourtrc ~/.yaourtrc; fi
+  if [ ! -d ~/.vim ]; then ln -s $dotfiles/vim ~/.vim; fi
+  if [ ! -d ~/.local/bin/scripts ]; then ln -s $dotfiles/scripts ~/.local/bin/scripts; fi
+  echo "All symlink have been made"
+}
+
+if [ -z "$1" ]; then show_help; exit 0; fi; 
+
+cd $dotfiles
+
+# Ask and execute the install script
+ask "Update submodules" submodule
+ask "Patch submodules" patch
+ask "Compile YCM" ycm
+ask "Install tmux-vim-select-pane" tvpane
+ask "Install fonts" fonts
+# ask "Install gnome-terminal theme"
+ask "Make symlinks" symlink