X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=f37966892fa5eed9dc1e3b8d2b03482b0a4b8827;hb=a7123ad231115a3e3ba2ff501b5b6f5fcda2228f;hp=889b3974b3adc53ec0457ac1dc8db967e38fc321;hpb=ff60bfd5bb985140bfb5448c27e4f509eaec0a30;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 889b397..f379668 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -70,10 +70,23 @@ prompt_git() {
                       printf "(unknown)")"
 
         [ -n "$s" ] && s=" [$s]"
-        printf "%s" "$branchName$s "
+        printf " (%s)" "$branchName$s"
     fi
 }
 
+if test -x /usr/bin/git >/dev/null 2>&1; then
+   if [ "`type -t __git_ps1`" != function ]; then
+      git_sh_prompt=`git --exec-path`/git-sh-prompt
+      test -r $git_sh_prompt && . $git_sh_prompt || :
+   fi
+   if [ "`type -t __git_ps1`" = function ]; then
+      GIT_PS1_SHOWDIRTYSTATE=true
+      GIT_PS1_SHOWSTASHSTATE=true
+      GIT_PS1_SHOWUNTRACKEDFILES=true
+      GIT_PS1_SHOWUPSTREAM=verbose
+   fi
+fi
+
 set_prompts() {
       OPS1=''
       # display the user, host and current working directory
@@ -95,8 +108,16 @@ set_prompts() {
       esac
 
    OPS1+="${debian_chroot:+($debian_chroot)}"
-   OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
-   OPS1+="\$(prompt_git)"
-   OPS1+="\\$\$SHLVL "
+   OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
+   if test -x /usr/bin/git >/dev/null 2>&1; then
+      if [ "`type -t __git_ps1`" = function ]; then
+         OPS1+="\$(__git_ps1)"
+      else
+         OPS1+="\$(prompt_git)"
+      fi
+   fi
+   # This is for .screenrc: shelltitle "\$ |$SHELL"
+   #OPS1+="\[\033k\033\\\\\]"
+   OPS1+=" \$SHLVL\\$ "
    export OPS1
 }