X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4bebeeae49c6da45ffe5930ae1c21d84daa571f5..93ba996def65bdebd7d7026caff9661d9b038ead:/bash_profile?ds=sidebyside

diff --git a/bash_profile b/bash_profile
index 692efc2..f2b0d38 100644
--- a/bash_profile
+++ b/bash_profile
@@ -137,6 +137,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"
 
@@ -155,8 +156,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 ;;
+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=$ftp ;;
+esac
 
 export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"