Merge branch 'master' of 76.182.74.61:stonewareslord/Sync

merging

bash_aliases

@@ -38,3 +38,5 @@ alias update='sudo apt-get update'
 alias upgrade='sudo apt-get update && sudo apt-get upgrade'
 alias ..='cl ..'
 alias ytdl="youtube-dl $@ -x --audio-format mp3 --audio-quality 0 -c -o '%(title)s.%(ext)s'"
+
+alias tux="tmux a||tmux"

sync.sh

@@ -1,4 +1,4 @@
-while getopts :bo option
+while getopts :bot option
 do
   case "$option" in
     b)
@@ -9,6 +9,10 @@ do
       fi
       vim +BundleInstall +qa
       ;;
+    t)
+      trash ~/.tmux.conf
+      ln -s ${PWD}/tmux.conf ~/.tmux.conf
+      ;;
     o)
       exit 0
       ;;
@@ -17,11 +21,10 @@ do
       ;;
   esac
 done
-trash ~/.tmux.conf ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.gitignore_global ~/.bashrc ~/.bash_aliases ~/.bash_functions
+trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.gitignore_global ~/.bashrc ~/.bash_aliases ~/.bash_functions
 ln -s ${PWD}/gitignore_global ~/.gitignore_global
 ln -s ${PWD}/vimrc ~/.vimrc
 ln -s ${PWD}/vimperatorrc ~/.vimperatorrc
-ln -s ${PWD}/tmux.conf ~/.tmux.conf
 ln -s ${PWD}/gitconfig ~/.gitconfig
 ln -s ${PWD}/bashrc ~/.bashrc
 ln -s ${PWD}/bash_aliases ~/.bash_aliases