.bashrc.*: be more robust against different systems

.bashrc host detection stuff was overly fragile and depended on all my
variables being set up beforehand (unnecessarily).

Also found the writetohistory stuff for emacs tramp sessions probably
had been fixed a while ago (we already detect TERM=dumb).  I think
where I'd seen the TRAMP shell commands being written to history was
on systems where I had no control over the .bashrc stuff there and
they just unconditionally assumed it was an interactive shell and
logged - can't do much about them...

Author: spacelama

files/homes/.bashrc

@@ -64,8 +64,7 @@ if [ -z "$NONINTERACT" -a -z "$PBS_ENVIRONMENT" ] ; then
         hushlogin=".hushlogin.$SHORTHOST"
         cd $HOME
         [ "$SHORTHOST" != pentane ] &&
-            echo "$hushlogin : /etc/motd ; :" |
-                make -f - -q $hushlogin || (
+            [ $hushlogin -nt /etc/motd ] || (
                     touch $hushlogin &&
                     cat /etc/motd &&
                     echo ------------------------------------------------------------

files/tree/etc/bash.bashrc.d/history.sh

@@ -101,7 +101,6 @@ function write_history_in_background() {
 }
 
 function writetohistory() {
-    #FIXME: ideally detect when we're inside emacs TRAMP and do nothing
     #    bt
 
     choosehistoryfile

files/tree/usr/local/bin/colorizecommand

@@ -163,7 +163,7 @@ highlight "$colour" $bright
 # output the header if not asked to run the output directly
 if ! $colourall ; then
     echo "${args[@]}"
-    highlight normal y
+    highlight normal true
 fi
 
 normaloutput
@@ -173,6 +173,6 @@ directoutput
 
 #and reset the colour if we were just colourizing the whole output:
 if $colourall ; then
-    highlight normal y
+    highlight normal true
 fi
 exit $exit

files/tree/usr/local/bin/colorizeprompt

@@ -2,44 +2,38 @@
 
 #set -x
 
-CHROOTSHORTHOST=$SHORTHOST
+CHROOTSHORTHOST="$SHORTHOST"
 
 if [ -e /etc/hostname ] ; then
     CHROOTSHORTHOST=`cat /etc/hostname | sed 's/\..*//'`
-#elif [ -e /etc/HOSTNAME ] ; then 
+#elif [ -e /etc/HOSTNAME ] ; then
 #    CHROOTSHORTHOST=`cat /etc/HOSTNAME | sed 's/\..*//'`   #new cluster nodes use dhcp and get the hostname wrong half the time -- since all the boxes I can ever hope to get root on, and hence use chroot, are debian, and debian uses /etc/hostname...
 fi
 
 
-if [ $REALHOST != $LONGHOST ] ; then
-    CHROOTSHORTHOST=$REALHOST
+if [ "$REALHOST" != "$LONGHOST" ] ; then
+    CHROOTSHORTHOST="$REALHOST"
 fi
 
 CHROOT=""
-case $CHROOTSHORTHOST in
+case "$CHROOTSHORTHOST" in
     $SHORTHOST|$SHORTHOST.*)
     ;;
     *)
         CHROOT="-`colorize --PS1prompt bright red -n chroot`"
     ;;
 esac
 
-file=$HOME/.bashcolors
-if [ ! -r $file ] ; then
-    file=/etc/bashcolors
-fi
-
-if [ ! -r $file ] ; then
-    echo -n "$USER@$CHROOTSHORTHOST$CHROOT"
-    exit
-fi
-
-cat /etc/bashcolors $HOME/.bashcolors 2>/dev/null | ( 
+{
+    cat /etc/bashcolors $HOME/.bashcolors 2>/dev/null
+    echo "root * dark red dark red"
+    echo "* * bright grey dark blue"
+} | (
     while read user hostname bu cu bh ch bg ; do
         if [ -n "$bg" ] ; then
             bg="--background $bg"
         fi
-        case $CHROOTSHORTHOST in
+        case "$CHROOTSHORTHOST" in
             $hostname)
                 if [[ "$USER" == $user ]] ; then
                     colorize --PS1prompt $bu $cu -n '\u'   #--PS1prompt is to tell colorize to print opening \[ and close \] ; -n is to tell echo to print no newline