X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1273afa0fb3c6438ab309b16c7d0179257667146..5ffa4795873e37c6b39cf83df82470c1a7119fa0:/dot/bashrc diff --git a/dot/bashrc b/dot/bashrc index fe4b375..8dc678b 100644 --- a/dot/bashrc +++ b/dot/bashrc @@ -63,24 +63,29 @@ if [ -t 0 ]; then fi ## If this session is insecure then highlight that. - if [ -z "$SSH_CLIENT" ] && - [ "$__mdw_sechost" != "`hostname`" ] - then + if [ -z "$SSH_CLIENT" ] && [ -z "$SCHROOT_CHROOT_NAME" ] && + [ "$__mdw_sechost" != "`hostname`" ] + then sec_l='(' sec_r=')' fi + ## If this is an schroot environment then point this out. + hqual="" + 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$sec_r \\w$git$rc$marker$right$unbold" + 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 - unset gitcolour rccolour uncolour git rc + unset gitcolour rccolour uncolour git rc hqual fi ###-------------------------------------------------------------------------- @@ -392,3 +397,5 @@ fi fi ###----- That's all, folks -------------------------------------------------- + +: