From 480f7c5925f033fd94d7b6701406b8f65c9790b9 Mon Sep 17 00:00:00 2001
From: Mahesh Asolkar <mahesh@mahesha.com>
Date: Mon, 18 Nov 2019 07:31:43 -0800
Subject: [PATCH] Bash and tmux updates

---
 user.bash_aliases | 3 +++
 user.tmux.conf    | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/user.bash_aliases b/user.bash_aliases
index 9da4e18..3f830cf 100644
--- a/user.bash_aliases
+++ b/user.bash_aliases
@@ -4,6 +4,9 @@
 if [ -f /etc/bash_completion.d/git-prompt ]; then
     source /etc/bash_completion.d/git-prompt
 fi
+if [ -f ~/git-prompt.sh ]; then
+    source ~/git-prompt.sh
+fi
 export GIT_PS1_SHOWDIRTYSTATE=1
 PS1='${debian_chroot:+($debian_chroot)}\[\033[01;92m\]$(hostname)\[\033[01;34m\] \w\[\033[01;35m\]$(__git_ps1 "  %s") \[\033[0m\]$ '
 
diff --git a/user.tmux.conf b/user.tmux.conf
index 9c4a383..d74a40d 100644
--- a/user.tmux.conf
+++ b/user.tmux.conf
@@ -45,6 +45,9 @@
 
 # Footer {{{
     # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-    run '~/.tmux/plugins/tpm/tpm'
+    if "test ! -d ~/.tmux/plugins/tpm" \
+        "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
+    if "test -d ~/.tmux/plugins/tpm" \
+        "run -b '~/.tmux/plugins/tpm/tpm'"
 # }}}
 # vim: foldenable foldmethod=marker