X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/9906310798d936a6cacd0ec5a2d3b607e911c423..c035e794d622d7074c8fa94e18cb5ddfea7c36a1:/dot/bash_profile

diff --git a/dot/bash_profile b/dot/bash_profile
index 37ed0ea..513f754 100644
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -19,7 +19,7 @@ cd $HOME
 # --- Add elements to a path string ---
 
 __mdw_addto () {
-  local var=$1 val dir=$2 new=""
+  local var=$1 val dir=$2 new="" change=nil
   eval "val=\$$var"
   shift 2
   for i in "$@"; do
@@ -27,7 +27,7 @@ __mdw_addto () {
     [ -d $i ] || continue
     case "X$val" in
       X)
-	val=$i
+	val=$i change=t
 	continue
 	;;
       X$i)
@@ -43,13 +43,13 @@ __mdw_addto () {
 	val=${val%:$i}
 	;;
     esac
-    new=$new:$i
+    new=$new:$i change=t
   done
   case $dir in
     l) val=${new#:}:$val;;
     r) val=$val$new;;
   esac
-  export $var=$val
+  case $change in t) export $var="$val" ;; esac
 }
 
 # --- Set the path variable ---
@@ -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"
 
@@ -186,6 +186,8 @@ esac
 
 export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"
 
+export OOO_FORCE_DESKTOP=gnome
+
 export PS_PERSONALITY=gnu
 
 export NC_SITES=cam:bos
@@ -230,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