X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/a5abc1d29be727b2eb2159a614c9f12b5e2ea9d9..8a425bd7802fb5bcda35025495d7e70b561769ff:/dot/bash_profile

diff --git a/dot/bash_profile b/dot/bash_profile
index ffea97f..a6015e9 100644
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -151,7 +151,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 P4CONFIG=.p4
 
 export BECOME="--preserve-environment"
 
@@ -232,11 +232,11 @@ fi
 
 [ -f "$HOME/.profile-local" ] && . "$HOME/.profile-local"
 
+fi
+
 # --- Now, if my .bashrc hasn't been run yet, run it ---
 #
 # Oh, don't do that if we don't have a terminal.
 
 [ -z "$__mdw_bashrc" ] && [ -t 0 ] && \
   [ -r $HOME/.bashrc ] && . $HOME/.bashrc
-
-fi