From 5c73a6f2ca741a16981e9e24a1fdea4dddd3b7cb Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Tue, 31 Jul 2012 17:04:58 -0400
Subject: [PATCH] betting rvmrc handling

---
 create-dev-env.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/create-dev-env.sh b/create-dev-env.sh
index 7fabb26f96..a369df6b3b 100755
--- a/create-dev-env.sh
+++ b/create-dev-env.sh
@@ -163,6 +163,11 @@ cat<<EO
 
   To compile scipy and numpy from source use the -c option
 
+  !!! Do not run this script from an existing virtualenv !!!
+  
+  If you are in a ruby/python virtualenv please start a new
+  shell. 
+
 EO
 info
 output "Press return to begin or control-C to abort"
@@ -172,12 +177,15 @@ read dummy
 exec > >(tee $LOG)
 exec 2>&1
 
-if [[ -f $HOME/.rvmrc ]]; then
-    output "$HOME/.rvmrc alredy exists, not adding $RUBY_DIR"
-else
-    output "Creating $HOME/.rmrc so rvm uses $RUBY_DIR"
+if ! grep -q "export rvm_path=$RUBY_DIR" ~/.rvmrc; then
+    if [[ -f $HOME/.rvmrc ]]; then
+        output "Copying existing .rvmrc to .rvmrc.bak"
+        cp $HOME/.rvmrc $HOME/.rvmrc.bak
+    fi
+    output "Creating $HOME/.rvmrc so rvm uses $RUBY_DIR"
     echo "export rvm_path=$RUBY_DIR" > $HOME/.rvmrc
 fi
+
 mkdir -p $BASE
 case `uname -s` in
     [Ll]inux)