fi;
export DEBEMAIL="don@debian.org"
+ export DEBHOME="$(eval 'echo' '~/projects/debian')"
# enable color support of ls and also add handy aliases
eval `dircolors -b`
fi;
# set up ssh-agent
- if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then
+ if which ssh-agent >/dev/null && [ -d ~/.ssh ] && \
+ [ -z "$SSH_CONNECTION" ] && [ -z "$SSH_CLIENT" ]; then
# for
if [ -e ~/.ssh/ssh_agent_info ] && \
[ -n "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)" ] && \
LANG=C
fi;
export LANG
- export PATH="~/bin:$PATH"
+
+ # If we're running on liszt, include /var/list/.bin in the path
+ if [ "$(hostname)" == "liszt" ] && [ -d /var/list/.bin ]; then
+ PATH="/var/list/.bin:$PATH"
+ fi;
+ export PATH="$(getent passwd $(id -u)|awk -F: '{print $6}')/bin:$PATH"
+
if [ ! -e ~/tmp ]; then
mkdir ~/tmp;
fi;
export TMPDIR="$(echo ~/tmp)";
- if [ -n "$(which devtodo)" ]; then
- for a in tda tdd tde; do
- alias "s${a}"="STODO_NO_COMMIT=1 $a"
- done;
-
- TODO_OPTIONS="--timeout --summary"
+# if [ -n "$(which devtodo)" ]; then
+# for a in tda tdd tde; do
+# alias "s${a}"="STODO_NO_COMMIT=1 $a"
+# done;
+#
+# TODO_OPTIONS="--timeout --summary"
cd ()
{
- builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+ # use pushd instead of cd
+ if [ -z "$1" ] || [ "$1" == "-" ]; then
+ builtin cd "$@"; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+ else
+ builtin pushd "$@" >/dev/null; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+ fi;
}
- pushd ()
- {
- builtin pushd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
- }
-
- popd ()
- {
- builtin popd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
- }
+# pushd ()
+# {
+# builtin pushd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+# }
+#
+# popd ()
+# {
+# builtin popd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+# }
# Run todo initially upon login
- devtodo ${TODO_OPTIONS}
- fi;
+# devtodo ${TODO_OPTIONS}
+# fi;
fi