* fix up emacs deleting vc windows and follow symlink confirmation

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index b0dbc2c3d61054025b37f77c3d736a295a7ee386..fb14d9598ad41445a791e97728b212f31b93835d 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -20,7 +20,12 @@ if [ "$PS1" ]; then
     fi;
     # bts debian options
 
+    if [ -e bin/faf ]; then
+       complete -F _command faf
+    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`
@@ -42,12 +47,12 @@ if [ "$PS1" ]; then
     # if it's a remote, SSH_CONNECTION will be set
     # set variable identifying the chroot you work in (used in the prompt below)
     
-    if [ -n "$SSH_CONNECTION" ]; then
+    if [ -n "$SSH_CONNECTION" -o -n "$SSH_CLIENT" ]; then
        # figure out what color to use
        COLOR=$(hostname|md5sum|perl -ne 'if (/^([a-f\d]{8})/) {
-              my $num = unpack(q(L),pack(q(h*),$1));
+              my $num = unpack(q(L),pack(q(H*),$1));
               my @col = map {(qq(0;${_}m),qq(1;${_}m))} 31..37;
-              my $col = $col[$num%$#col];
+              my $col = $col[$num % @col];
               if ($col eq q(0;36m)) {
                  $col = q(1;30m);
               }
@@ -99,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)" ] && \
@@ -121,7 +127,13 @@ if [ "$PS1" ]; then
        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;
@@ -136,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 ()