bash_prompt: Test if `git` exists

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

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 889b3974b3adc53ec0457ac1dc8db967e38fc321..13d0c2dc599dd78313cfb470cc8eb199da693d72 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -96,7 +96,9 @@ set_prompts() {
 
    OPS1+="${debian_chroot:+($debian_chroot)}"
    OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
-   OPS1+="\$(prompt_git)"
+   if test -x /usr/bin/git >/dev/null 2>&1; then
+      OPS1+="\$(prompt_git)"
+   fi
    OPS1+="\\$\$SHLVL "
    export OPS1
 }