X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e61fa1ae5f252cb86c5b86b12c68fd55113e8b55..192d711b6e2966cf6a0457db6929a95c6b37d69d:/bash_profile

diff --git a/bash_profile b/bash_profile
index af9021f..017ff4c 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
 #
 
@@ -119,14 +117,23 @@ 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//:"
 
-__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
 
@@ -139,6 +146,7 @@ export BASCAT="-l +n"
 export CVS_RSH=ssh
 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"
 
@@ -146,18 +154,30 @@ 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`
 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"