include support for git-prompt and git bash completion on os x

1 files changed, 34 insertions, 1 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index 06a4c4a..01e5e04 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,5 +1,9 @@
 LC_ALL="en_US.UTF-8"
-PS1="[\u@\[\e[38;5;148m\]\h\[\e[m\]:\[\e[36m\]\W\[\e[m\]\[\e[m\]]\[\e[m\]\$\[\e[m\] "
+# This PS1 is completed at the end, allowing statuses to be included between the directory and closing $
+PS1="[\u@\[\e[38;5;148m\]\h\[\e[m\]:\[\e[36m\]\W\[\e[m\]\[\e[m\]]\[\e[m\]"
+local END_PS1="\$\[\e[m\] "
+# This is the original PS1
+#PS1="[\u@\[\e[38;5;148m\]\h\[\e[m\]:\[\e[36m\]\W\[\e[m\]\[\e[m\]]\[\e[m\]\$\[\e[m\] "
 PATH="${HOME}/bin:${HOME}/.local/bin:${PATH}"
 
 # Disable bash deprecation warning on OS X
@@ -157,6 +161,7 @@ alias define='sdcv'
 
 # Git Related
 function delete-branches() {
+    # Interactive branch deleter
     git branch |
         grep --invert-match '\*' |
         cut -c 3- |
@@ -164,6 +169,31 @@ function delete-branches() {
         xargs --no-run-if-empty git branch --delete --force
 }
 
+local XCODE_SELECT=`which xcode-select`
+if [[ -x $XCODE_SELECT ]]; then
+    local OSX_GIT_COMPLETION=`xcode-select -p`/usr/share/git-core/git-completion.bash
+    if [[ -f $OSX_GIT_COMPLETION ]]; then
+        source $OSX_GIT_COMPLETION
+    fi
+    local OSX_GIT_PROMPT=`xcode-select -p`/usr/share/git-core/git-prompt.sh
+    if [[ -f $OSX_GIT_PROMPT ]]; then
+        source $OSX_GIT_PROMPT
+    fi
+fi
+
+if [[ $(type -t __git_ps1) == function ]]; then
+    GIT_PS1_SHOWDIRTYSTATE=1  # Show unstaged and staged indicators
+    GIT_PS1_SHOWUNTRACKEDFILES=1  # show % for untracked files
+    # GIT_PS1_SHOWUPSTREAM=auto  # show +/- changes with upstream
+    #PS1=$PS1'$(__git_ps1 " (%s)")'
+
+    # Alternatively, for a slightly faster prompt, __git_ps1 can  be
+    # used for PROMPT_COMMAND in Bash with two parameters, <pre> and
+    # <post>, which are strings you would put in $PS1 before and after
+    # the status string generated by the git-prompt machinery.
+    export PROMPT_COMMAND="__git_ps1 '${PS1}' '${END_PS1}'; ${PROMPT_COMMAND}"
+fi
+
 # The Gemini earbuds don't sync the volume. This turns up the hardware volume control
 alias geminiup="dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0/dev_7C_C4_EF_CC_45_43 org.bluez.MediaControl1.VolumeUp"
 alias geminidown="dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0/dev_7C_C4_EF_CC_45_43 org.bluez.MediaControl1.VolumeDown"
@@ -199,3 +229,6 @@ TERRAFORM=`which terraform`
 if [[ -x $TERRAFORM ]]; then
     complete -C $TERRAFORM terraform
 fi
+
+# Close off the PS1 with the $
+PS1=${PS1}${END_PS1}