dot/bashrc: Show Git branch name in the prompt, if machinery available.

diff --git a/dot/bashrc b/dot/bashrc
index 7fa8e3aa5e9f80e97d86723322639aba546411ba..fe4b3751d3bd5ce4f5938a563ed7feaf9a7930a8 100644 (file)
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -35,12 +35,13 @@ if [ -t 0 ]; then
        "") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
        *) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
       esac
        "") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
        *) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
       esac

+      gitcolour="\[$(tput setaf 6)\]"

       rccolour="\[$(tput setaf 1)\]"
       uncolour="\[$(tput op)\]"
       nl="\[\r\]"
       ;;
     *)
       rccolour="\[$(tput setaf 1)\]"
       uncolour="\[$(tput op)\]"
       nl="\[\r\]"
       ;;
     *)

-      bold='' unbold='' nl='' rccolour='' uncolour='';;
+      bold='' unbold='' nl='' gitcolour='' rccolour='' uncolour='';;

   esac
 
   ## Choose the right delimiters.  Highlight root prompts specially;
   esac
 
   ## Choose the right delimiters.  Highlight root prompts specially;


@@ -69,12 +70,17 @@ if [ -t 0 ]; then
   fi
 
   ## Build the prompt string.
   fi
 
   ## Build the prompt string.

+  if type __git_ps1 >/dev/null 2>&1; then
+    git="$unbold$gitcolour\$(rc=\$?;__git_ps1;exit \$rc)$uncolour$bold"
+  else
+    git=""
+  fi

   rc="$unbold$rccolour\$(rc=\$?;case \$rc in 0);;"
   rc="$rc*)echo -n \" rc=\$rc\";;esac;exit \$rc)$uncolour$bold"
   rc="$unbold$rccolour\$(rc=\$?;case \$rc in 0);;"
   rc="$rc*)echo -n \" rc=\$rc\";;esac;exit \$rc)$uncolour$bold"

-  PS1="$nl$bold$left$sec_l$u\\h$sec_r \\w$rc$marker$right$unbold"
+  PS1="$nl$bold$left$sec_l$u\\h$sec_r \\w$git$rc$marker$right$unbold"

   PS2="$PS1 $bold>$unbold "
   unset nl bold unbold left right sec_l sec_r marker
   PS2="$PS1 $bold>$unbold "
   unset nl bold unbold left right sec_l sec_r marker

-  unset rccolour uncolour rc
+  unset gitcolour rccolour uncolour git rc

 fi
 
 ###--------------------------------------------------------------------------
 fi
 
 ###--------------------------------------------------------------------------