# --- 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
[ -d $i ] || continue
case "X$val" in
X)
- val=$i
+ val=$i change=t
continue
;;
X$i)
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 ---
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"
[ -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