X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/53906acf9ec96ec148bf1a18dcdfed785d69c377..e6a7e588f9a3abdcdb6cb031dc56ca7795814c50:/dot/bashrc diff --git a/dot/bashrc b/dot/bashrc index 6feeb4d..8dc678b 100644 --- a/dot/bashrc +++ b/dot/bashrc @@ -74,13 +74,14 @@ if [ -t 0 ]; then hqual="$hqual${SCHROOT_CHROOT_NAME+/$SCHROOT_CHROOT_NAME}" ## 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="" + git="" rc="" + if [[ ${BASH_VERSINFO[0]} -ge 4 ]]; then + if type __git_ps1 >/dev/null 2>&1; then + git="$unbold$gitcolour\$(rc=\$?;__git_ps1;exit \$rc)$uncolour$bold" + fi + rc="$unbold$rccolour\$(rc=\$?;case \$rc in 0);;" + rc="$rc*)echo -n \" rc=\$rc\";;esac;exit \$rc)$uncolour$bold" fi - 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$hqual$sec_r \\w$git$rc$marker$right$unbold" PS2="$PS1 $bold>$unbold " unset nl bold unbold left right sec_l sec_r marker