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

diff --git a/bash_profile b/bash_profile
index af9021f..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
 #
 
@@ -96,7 +94,7 @@ emacs_startup_args="--no-site-file --mdw-fast-startup -nw"
 for ed in \
 	"emacs22 $emacs_startup_args" \
 	"emacs21 $emacs_startup_args" \
-	mg \
+	zile mg \
 	"emacs -nw" \
 	vi pico nano ae; do
   name=`echo $ed | sed 's/ .*$//'`
@@ -114,19 +112,33 @@ umask 002
 
 [ -z "$HOST" ] && export HOST=`hostname`
 
-if [ "$DISPLAY" = "" ]; then
-  : ${LC_CTYPE=${LANG-${LC_ALL-`mdw-conf console-ctype`}}}
+if [ "$DISPLAY" != "" ]; then
+  LANG=`mdw-conf x-ctype`
 else
-  LC_CTYPE=`mdw-conf x-ctype`
+  : ${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 LANG LC_ALL LC_COLLATE
-export LC_CTYPE
+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
 
@@ -139,25 +151,38 @@ 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"
 
 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 ;;
+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
+
+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"