From e04a3368683fd88836e1d4f8d98526195e735643 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Tue, 9 Feb 2016 18:43:25 +0000 Subject: [PATCH] dot/bashrc: Improvements for handling schroot(1) environments. Organization: Straylight/Edgeware From: Mark Wooding * Recognize that an `schroot' is likely secure. * Include the chroot name in the prompt. --- dot/bashrc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dot/bashrc b/dot/bashrc index 4b51e7f..6feeb4d 100644 --- a/dot/bashrc +++ b/dot/bashrc @@ -63,12 +63,16 @@ 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" @@ -77,10 +81,10 @@ if [ -t 0 ]; then 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 ###-------------------------------------------------------------------------- -- [mdw]