X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/6121c48e2dbce8b6a2a4d9a21d583b95b92ee8b0..7cfa1f1a61478a99cd1c9123b830745459de652f:/bash_profile

diff --git a/bash_profile b/bash_profile
index 3cae439..383acab 100644
--- a/bash_profile
+++ b/bash_profile
@@ -54,19 +54,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,9 +84,9 @@ __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 ---
@@ -121,7 +108,13 @@ umask 002
 
 [ -z "$HOST" ] && export HOST=`hostname`
 
-unset LANG LC_COLLATE
+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
 
 __mdw_programp distcc && export CCACHE_PREFIX=distcc
 
@@ -131,15 +124,15 @@ __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"
 
@@ -156,8 +149,8 @@ export LESSCHARSET
 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"