X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.bashrc;h=c60fdfdbcc7ee78ea70cf5cc77387647deff9670;hp=602d3a810fda11412ce1b9b3588a1db788dc3d29;hb=b103f4b7c8f98b73a11def7768490ff9639dfaf6;hpb=ca52198c2318b392a82f2d1fe5f9c786ab480c88

diff --git a/.bashrc b/.bashrc
index 602d3a8..c60fdfd 100644
--- 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,40 +127,46 @@ 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;
     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 ()
 	{
 	    # use pushd instead of cd
 	    if [ -z "$1" ] || [ "$1" == "-" ]; then
-		builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+		builtin cd "$@"; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
 	    else
-		builtin pushd "$@" >/dev/null && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+		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