X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c24ba91075eabe1a38cd6bdafbc72c3c8f4b2747..c537b3bfacb5ca65cc6c3c2b7919c1b3190bb3a0:/bash_profile

diff --git a/bash_profile b/bash_profile
index c290aa9..08e4e13 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
 #
 
@@ -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 \
@@ -97,22 +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
 
 # --- Find a text editor ---
 
-export EDITOR=ed
-for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
+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" \
+	zile mg \
+	"emacs -nw" \
+	vi pico nano ae; do
   name=`echo $ed | sed 's/ .*$//'`
   if __mdw_programp "$name"; then
-    EDITOR=$ed
+    MDW_EDITOR=$ed
     break
   fi
 done
-export VISUAL="$EDITOR"
+
+export EDITOR=mdw-editor VISUAL=mdw-editor
 
 # --- Various options for programs ---
 
@@ -120,40 +112,77 @@ umask 002
 
 [ -z "$HOST" ] && export HOST=`hostname`
 
-unset LANG LC_COLLATE
+if [ "$DISPLAY" != "" ]; then
+  LANG=`mdw-conf x-ctype`
+else
+  : ${LANG=${LC_CTYPE-${LC_ALL-`mdw-conf console-ctype`}}}
+  case "$TERM,`tty`" in
+    linux,/dev/tty*)
+      if vt-is-UTF8 >/dev/null 2>&1; then
+	ctype=.utf8
+      else
+	ctype=
+      fi
+      LANG=${LANG%.*}$ctype
+      ;;
+  esac
+fi
+unset LC_ALL
+export LC_COLLATE=POSIX LANG
 
 __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
+__mdw_addto INFOPATH r \
+	$HOME/info \
+	/usr/info /usr/share/info \
+	/usr/local/info /usr/local/share/info \
+	/usr/local/share/info/its
 __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 P4PORT=`mdw-conf p4-port` P4USER=`mdw-conf p4-user`
 
 export BECOME="--preserve-environment"
 
 export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
 export LESS="-iqgRh1FX"
 export LESSOPEN="|lesspipe.sh %s"
-export LESSCHARSET=latin1
+case "${LC_CTYPE-$LANG}" in
+  *utf8 | *utf-8 | *UTF8 | *UTF-8) LESSCHARSET=utf-8 ;;
+  *) LESSCHARSET=latin1 ;;
+esac
+export LESSCHARSET
+__mdw_programp global && export LESSGLOBALTAGS=global
+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 "$ftp_proxy" ] && export ftp_proxy=$http_proxy
+[ -z "$NNTPSERVER" ] && export NNTPSERVER=`mdw-conf nntp-server`
+
+http=`mdw-conf http-proxy none`
+case "${http_proxy-none},$http" in
+  *,none) ;;
+  none,*) export http_proxy=http://$http/ ;;
+esac
+ftp=`mdw-conf ftp-proxy none`
+case "${ftp_proxy-none},$ftp,${http_proxy-none}" in
+  *,none,none) ;;
+  none,none,*) export ftp_proxy=$http_proxy ;;
+  none,*,*) export ftp_proxy=http://$ftp/ ;;
+esac
 
 export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"