X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/68aea1d9f03a2354f5c94c4855f08ed79162e801..e04c4857c4c68005c13413a3e89abcbfdd81760c:/bash_profile

diff --git a/bash_profile b/bash_profile
index 8b236ee..3da56a8 100644
--- a/bash_profile
+++ b/bash_profile
@@ -29,9 +29,9 @@ __mdw_addto () {
     [ -d $i ] || continue
     case "X$val" in
       X)
-        val=$i
-        continue
-        ;;
+	val=$i
+	continue
+	;;
       X$i)
 	continue
 	;;
@@ -59,7 +59,7 @@ __mdw_addto () {
 __mdw_conf () {
   local var=$1
   val=`sed -n "
-    /^[ 	]*$var[ 	]*=[ 	]*\(\|.*[^ 	]\)[ 	]*$/ {
+    /^[	 ]*$var[	 ]*=[	 ]*\(\|.*[^	 ]\)[	 ]*$/ {
       s//\1/; p; q
     }
   " ${MDWCONF-$HOME/.mdw.conf}`
@@ -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,12 +102,18 @@ export NAME="Mark Wooding"
 export EMAIL=`__mdw_conf email`
 export QMAILINJECT=c
 
-# --- GIT environment things ---
+# --- Find a text editor ---
 
-export GIT_AUTHOR_NAME=$NAME
-export GIT_AUTHOR_EMAIL=$EMAIL
-export GIT_COMMITTER_NAME=$NAME
-export GIT_COMMITTER_EMAIL=$EMAIL
+export MDW_EDITOR=ed
+for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
+  name=`echo $ed | sed 's/ .*$//'`
+  if __mdw_programp "$name"; then
+    MDW_EDITOR=$ed
+    break
+  fi
+done
+
+export EDITOR=mdw-editor VISUAL=mdw-editor
 
 # --- Various options for programs ---
 
@@ -111,17 +121,9 @@ umask 002
 
 [ -z "$HOST" ] && export HOST=`hostname`
 
-unset LANG
+unset LANG LC_COLLATE
 
-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
-    EDITOR=$ed
-    break
-  fi
-done
-export VISUAL="$EDITOR"
+__mdw_programp distcc && export CCACHE_PREFIX=distcc
 
 export TEXINPUTS=".:$HOME/lib/tex//:"
 
@@ -142,7 +144,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"
@@ -171,7 +173,7 @@ eval `start-ssh-agent -b`
 if [ -z "$__mdw_bashrc" ] && [ "$__mdw_force_secure_session" = "yes" ] ||
    ( tty="`tty`" devtty="(/dev/)?${tty#/dev/}"
      { { { [ -e /etc/securetty ] && sectty=/etc/securetty; } ||
-         { [ -e /etc/securettys ] && sectty=/etc/securettys; }; } &&
+	 { [ -e /etc/securettys ] && sectty=/etc/securettys; }; } &&
        egrep "$devtty" $sectty >/dev/null; } ||
      { [ -e /etc/default/login ] &&
        egrep "^CONSOLE=$devtty" /etc/default/login >/dev/null; } ||