From: Oleg Broytman <phd@phdru.name>
Date: Fri, 31 Jul 2020 07:42:00 +0000 (+0300)
Subject: bash_prompt: Test if `git` exists
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=47fb918dcb6a516ac154ebff26c0c0b5c104c0e3;p=dotfiles.git

bash_prompt: Test if `git` exists
---

diff --git a/.shellrc b/.shellrc
index 70393ad..b4b7a81 100644
--- 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 889b397..13d0c2d 100644
--- 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
 }