X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/05e6fa847d68602dc8502507fe1195d2b1d25286..dfd10975ec8a6e231e1385309189b72688b25ed5:/bash_profile

diff --git a/bash_profile b/bash_profile
index 7283d15..057f797 100644
--- a/bash_profile
+++ b/bash_profile
@@ -117,9 +117,14 @@ if [ "$DISPLAY" = "" ]; then
 else
   LC_CTYPE=`mdw-conf x-ctype`
 fi
-unset LANG LC_ALL LC_COLLATE
+unset LANG LC_ALL
 export LC_CTYPE
 
+for lc in TIME NUMERIC MONETARY PAPER NAME ADDRESS TELEPHONE MEASUREMENT; do
+  eval "export LC_$lc=$LC_CTYPE"
+done
+export LC_COLLATE=POSIX
+
 __mdw_programp distcc && export CCACHE_PREFIX=distcc
 
 export TEXINPUTS=".:$HOME/lib/tex//:"
@@ -145,10 +150,11 @@ export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
 export LESS="-iqgRh1FX"
 export LESSOPEN="|lesspipe.sh %s"
 case "$LC_CTYPE" in
-  *utf8*) LESSCHARSET=utf-8 ;;
+  *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`
@@ -156,8 +162,18 @@ 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
+
+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"