From e35f03aa3a76a451304a9c54396b81ed1ecc800b Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Sat, 19 May 2012 14:56:04 -0400
Subject: [PATCH] ops bashrc stuff and autoenv

---
 bash_profile | 2 ++
 bashrc       | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bash_profile b/bash_profile
index e4e4e96..3226348 100644
--- a/bash_profile
+++ b/bash_profile
@@ -38,10 +38,12 @@ _source_host_specific_rcfile(){
 _source_bash_extras()
 {
     local _BASH_EXTRAS="
+    $HOME/.bashrc_local
     $HOME/.bash_aliases
     $HOME/.bash_functions
     /etc/bash_completion
     $HOME/.bash_completion
+    $HOME/.autoenv/activate.sh
     "
     for ext in $_BASH_EXTRAS ; do
         if [ -e "$ext" ] ; then
diff --git a/bashrc b/bashrc
index f75cb86..b48afa3 100644
--- a/bashrc
+++ b/bashrc
@@ -4,7 +4,6 @@ PATH="$HOME/bin:$PATH"
 export PATH
 
 export PS1="\u@\h:\w\$ "
-test -f "$HOME/.bashrc_local" && source "$HOME/.bashrc_local"
 
 if test -t 0
 then