X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.bashrc;h=a222b7ec8e6886c0d1374ad6648f1478c96b151a;hp=56950bfba2155d5f50cee9d4d4068553739c037a;hb=2bf349ab15f7a9f1318ed63ed44c3548f1cae9a1;hpb=509b0099859d6baaae998f44ed82732e456c1e56

diff --git a/.bashrc b/.bashrc
index 56950bf..a222b7e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -25,30 +25,38 @@ if [ "$PS1" ]; then
     # enable color support of ls and also add handy aliases
     eval `dircolors -b`
     alias ls='ls --color=auto'
-    alias gr='gimp-remote-2.2'
+    alias gr='gimp-remote'
     alias emc='sane_editor'
 
     alias svn-b="svn-buildpackage --svn-builder 'pdebuild --buildresult ..' --svn-ignore-new"
 
     # set a fancy prompt
     #printf '\33]2;%s\007'
+    
+    # See if we're in a chroot
+    if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+	debian_chroot=$(cat /etc/debian_chroot)
+    fi
+
     # we want to set the color based on what machine we're on
     # if it's a remote, SSH_CONNECTION will be set
-    if [ -n "$SSH_CONNECTION" ]; then
+    # set variable identifying the chroot you work in (used in the prompt below)
+    
+    if [ -n "$SSH_CONNECTION" -o -n "$SSH_CLIENT" ]; then
 	# figure out what color to use
 	COLOR=$(hostname|md5sum|perl -ne 'if (/^([a-f\d]{8})/) {
-              my $num = unpack(q(L),pack(q(h*),$1));
+              my $num = unpack(q(L),pack(q(H*),$1));
               my @col = map {(qq(0;${_}m),qq(1;${_}m))} 31..37;
-              my $col = $col[$num%$#col];
+              my $col = $col[$num % @col];
               if ($col eq q(0;36m)) {
                  $col = q(1;30m);
               }
               print $col;
               }')
-	PS1="\[\033[$COLOR\]\h \[\033[0;36m\]\t \w$\[\033[0m\] "
+	PS1="${debian_chroot:+($debian_chroot)}\[\033[$COLOR\]\h \[\033[0;36m\]\t \w$\[\033[0m\] "
 	unset COLOR
     else
-	PS1="\[\033[0;36m\]\h \t \w$\[\033[0m\] "
+	PS1="${debian_chroot:+($debian_chroot)}\[\033[0;36m\]\h \t \w$\[\033[0m\] "
     fi;
     # \[\033[1;36m\][\w]\n\[\033[0;36m\][\h|\t]$ \[\033[0m\]