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

diff --git a/bash_profile b/bash_profile
index 8b236ee..692efc2 100644
--- a/bash_profile
+++ b/bash_profile
@@ -1,7 +1,5 @@
 # -*-sh-*-
 #
-# $Id: .profile,v 1.3 1997/01/09 20:30:23 mdw Exp $
-#
 # Bash startup things
 #
 
@@ -29,9 +27,9 @@ __mdw_addto () {
     [ -d $i ] || continue
     case "X$val" in
       X)
-        val=$i
-        continue
-        ;;
+	val=$i
+	continue
+	;;
       X$i)
 	continue
 	;;
@@ -54,19 +52,6 @@ __mdw_addto () {
   export $var=$val
 }
 
-# --- Find a configuration item ---
-
-__mdw_conf () {
-  local var=$1
-  val=`sed -n "
-    /^[ 	]*$var[ 	]*=[ 	]*\(\|.*[^ 	]\)[ 	]*$/ {
-      s//\1/; p; q
-    }
-  " ${MDWCONF-$HOME/.mdw.conf}`
-  case "$val" in "~"*) val=`eval "echo ${val%%/*}"`${val#\~};; esac
-  echo "$val"
-}
-
 # --- Set the path variable ---
 
 __mdw_addto PATH l \
@@ -80,6 +65,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
@@ -93,17 +82,29 @@ __mdw_addto MANPATH l \
 
 # --- Where my mail comes from ---
 
-export MAIL=`__mdw_conf mailbox`
+export MAIL=`mdw-conf mailbox`
 export NAME="Mark Wooding"
-export EMAIL=`__mdw_conf email`
+export EMAIL=`mdw-conf email`
 export QMAILINJECT=c
 
-# --- GIT environment things ---
+# --- Find a text editor ---
+
+export MDW_EDITOR=ed
+emacs_startup_args="--no-site-file --mdw-fast-startup -nw"
+for ed in \
+	"emacs22 $emacs_startup_args" \
+	"emacs21 $emacs_startup_args" \
+	mg \
+	"emacs -nw" \
+	vi pico nano ae; do
+  name=`echo $ed | sed 's/ .*$//'`
+  if __mdw_programp "$name"; then
+    MDW_EDITOR=$ed
+    break
+  fi
+done
 
-export GIT_AUTHOR_NAME=$NAME
-export GIT_AUTHOR_EMAIL=$EMAIL
-export GIT_COMMITTER_NAME=$NAME
-export GIT_COMMITTER_EMAIL=$EMAIL
+export EDITOR=mdw-editor VISUAL=mdw-editor
 
 # --- Various options for programs ---
 
@@ -111,17 +112,15 @@ umask 002
 
 [ -z "$HOST" ] && export HOST=`hostname`
 
-unset LANG
+if [ "$DISPLAY" = "" ]; then
+  : ${LC_CTYPE=${LANG-${LC_ALL-`mdw-conf console-ctype`}}}
+else
+  LC_CTYPE=`mdw-conf x-ctype`
+fi
+unset LANG LC_ALL LC_COLLATE
+export LC_CTYPE
 
-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//:"
 
@@ -129,29 +128,34 @@ __mdw_addto INFOPATH r $HOME/info /usr/info /usr/share/info /usr/local/info
 __mdw_addto PERLLIB r $HOME/lib/perl
 __mdw_addto PYTHONPATH r $HOME/lib/python
 
-export __MDW_ROOTLY=`__mdw_conf rootly`
+export __MDW_ROOTLY=`mdw-conf rootly`
 
 [ -z "$LS_OPTIONS" ] && export LS_OPTIONS="-F"
 
 export BASCAT="-l +n"
 
 export CVS_RSH=ssh
-export CVSROOT=`__mdw_conf cvs-root`
-export SVNROOT=`__mdw_conf svn-root`
+export CVSROOT=`mdw-conf cvs-root`
+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
+case "$LC_CTYPE" in
+  *utf8*) LESSCHARSET=utf-8 ;;
+  *) LESSCHARSET=latin1 ;;
+esac
+export LESSCHARSET
+export NCURSES_NO_UTF8_ACS=1
 # export MAKEFLAGS="-j4"
 [ "$TMPDIR" ] || eval `tmpdir -b`
 export TMP=$TMPDIR
 export PERL_READLINE_NOWARN=yes
 
-[ -z "$NNTPSERVER" ] && export NNTPSERVER=`__mdw_conf nntp-server`
-[ -z "$http_proxy" ] && export http_proxy=http://`__mdw_conf http-proxy`/
+[ -z "$NNTPSERVER" ] && export NNTPSERVER=`mdw-conf nntp-server`
+[ -z "$http_proxy" ] && export http_proxy=http://`mdw-conf http-proxy`/
 [ -z "$ftp_proxy" ] && export ftp_proxy=$http_proxy
 
 export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"
@@ -171,7 +175,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; } ||