Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/profile

[profile] / bash_profile

diff --git a/bash_profile b/bash_profile
index 1f0306c..c290aa9 100644 (file)
--- a/bash_profile
+++ b/bash_profile
@@ -80,6 +80,10 @@ if [ -d /usr/local/plan9 ]; then
     $PLAN9/bin
 fi
 
+# --- Find whether a program exists ---
+
+__mdw_programp () { type -t >/dev/null "$1"; }
+
 # --- And the same for manual pages ---
 
 case "$MACHTIME" in
@@ -98,24 +102,28 @@ export NAME="Mark Wooding"
 export EMAIL=`__mdw_conf email`
 export QMAILINJECT=c
 
-# --- Various options for programs ---
-
-umask 002
-
-[ -z "$HOST" ] && export HOST=`hostname`
-
-unset LANG
+# --- Find a text editor ---
 
 export EDITOR=ed
 for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
   name=`echo $ed | sed 's/ .*$//'`
-  if type -t >/dev/null "$name"; then
+  if __mdw_programp "$name"; then
     EDITOR=$ed
     break
   fi
 done
 export VISUAL="$EDITOR"
 
+# --- Various options for programs ---
+
+umask 002
+
+[ -z "$HOST" ] && export HOST=`hostname`
+
+unset LANG LC_COLLATE
+
+__mdw_programp distcc && export CCACHE_PREFIX=distcc
+
 export TEXINPUTS=".:$HOME/lib/tex//:"
 
 __mdw_addto INFOPATH r $HOME/info /usr/info /usr/share/info /usr/local/info
@@ -135,7 +143,7 @@ export SVNROOT=`__mdw_conf svn-root`
 export BECOME="--preserve-environment"
 
 export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
-export LESS="-iqgRh1"
+export LESS="-iqgRh1FX"
 export LESSOPEN="|lesspipe.sh %s"
 export LESSCHARSET=latin1
 # export MAKEFLAGS="-j4"