.shellrc: Use `__git_ps1` if available

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index b4b7a8191b737e0da5d9006c0e92f631ee65110e..871747b3432d4e754b7c18126a591a628a1f15c8 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -346,11 +346,15 @@ mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
       if [ "`type -t short_curdir`" = function ]; then
-         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
+         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
          if test -x /usr/bin/git >/dev/null 2>&1; then
-            OPS1+="\$(prompt_git)"
+            if [ "`type -t __git_ps1`" = function ]; then
+               OPS1+="\$(__git_ps1)"
+            else
+               OPS1+="\$(prompt_git)"
+            fi
          fi
-         OPS1+="\\$\$SHLVL "
+         OPS1+=" \\$\$SHLVL "
       else
          OPS1="\u@\h:\W \\$"
       fi