* add archimedes.vpn.prometheuslabor.com to the list of allowed locations for the...

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 99a9e9713b9899ddd0d7b39e896662a02ca99b15..c1bdbbe70e271d6c9d7ca03c3a31cc6b84f9ea0d 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -25,6 +25,7 @@ if [ "$PS1" ]; then
     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`
@@ -103,7 +104,8 @@ if [ "$PS1" ]; then
     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)" ] && \
@@ -125,7 +127,13 @@ if [ "$PS1" ]; then
        LANG=C
     fi;
     export LANG
+    
+    # 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="~/bin:$PATH"
+    
     if [ ! -e ~/tmp ]; then
        mkdir ~/tmp;
     fi;
@@ -140,7 +148,12 @@ if [ "$PS1" ]; then
 
        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 ()