update svn:ignore in emacs.d

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index a222b7ec8e6886c0d1374ad6648f1478c96b151a..06c0ab08c5248526ce70cc4b692b2ef1956eb1c5 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -20,6 +20,10 @@ if [ "$PS1" ]; then
     fi;
     # bts debian options
 
+    if [ -e bin/faf ]; then
+       complete -F _command faf
+    fi;
+
     export DEBEMAIL="don@debian.org"
 
     # enable color support of ls and also add handy aliases
@@ -121,7 +125,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;
@@ -136,7 +146,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 ()