From c6ca8ab61f32078945ca0e7236f126312a5eb452 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Wed, 18 Jul 2012 18:51:28 -0400
Subject: [PATCH 1/2] Update dev script repos

* remove hg data repo
* pull the 6.002x repo
---
 create-dev-env.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/create-dev-env.sh b/create-dev-env.sh
index 7b798c5b8c..d178397cc7 100755
--- a/create-dev-env.sh
+++ b/create-dev-env.sh
@@ -82,19 +82,20 @@ clone_repos() {
         fi
         git clone git@github.com:MITx/askbot-devel >>$LOG 
     fi
-    
+
+    # By default, dev environments start with a copy of 6.002x
     cd "$BASE"
-    if [[ -d "$BASE/data/.hg" ]]; then
-        output "Pulling data"
-        cd "$BASE/data"
-        hg pull >>$LOG
-        hg update >>$LOG
+    REPO="content-mit-6002x"
+    if [[ -d "$BASE/data/$REPO/.git" ]]; then
+        output "Pulling $REPO"
+        cd "$BASE/data/$REPO"
+        git pull >>$LOG
     else
-        output "Cloning data"
-        if [[ -d "$BASE/data" ]]; then
-            mv "$BASE/data" "${BASE}/data.bak.$$"
+        output "Cloning $REPO"
+        if [[ -d "$BASE/data/$REPO" ]]; then
+            mv "$BASE/data/$REPO" "${BASE}/data/$REPO.bak.$$"
         fi
-        hg clone ssh://hg-content@gp.mitx.mit.edu/data >>$LOG 
+        git clone git@github.com:MITx/$REPO >>$LOG
     fi
 }
 

From 42fa0806feb0114925ed10fa2fbb58c546239bb1 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Thu, 19 Jul 2012 16:13:56 -0400
Subject: [PATCH 2/2] Fix paths in create-dev-env.sh

* need to be in mitx/ to install common/lib/*
* create data dir if it doesn't exit
* add a few more log messages
* Change url for our fork of django-pipeline to stop the hanging checkouts.
  It works either way on my machine, so not sure if this will fix it.
---
 create-dev-env.sh | 10 ++++++++--
 requirements.txt  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/create-dev-env.sh b/create-dev-env.sh
index d178397cc7..5bd7971629 100755
--- a/create-dev-env.sh
+++ b/create-dev-env.sh
@@ -85,6 +85,7 @@ clone_repos() {
 
     # By default, dev environments start with a copy of 6.002x
     cd "$BASE"
+    mkdir -p "$BASE/data"
     REPO="content-mit-6002x"
     if [[ -d "$BASE/data/$REPO/.git" ]]; then
         output "Pulling $REPO"
@@ -95,6 +96,7 @@ clone_repos() {
         if [[ -d "$BASE/data/$REPO" ]]; then
             mv "$BASE/data/$REPO" "${BASE}/data/$REPO.bak.$$"
         fi
+	cd "$BASE/data"
         git clone git@github.com:MITx/$REPO >>$LOG
     fi
 }
@@ -285,10 +287,14 @@ fi
 
 output "Installing askbot requirements"
 pip install -r askbot-devel/askbot_requirements.txt >>$LOG 
+output "Installing askbot-dev requirements"
 pip install -r askbot-devel/askbot_requirements_dev.txt >>$LOG 
-output "Installing MITx requirements"
+output "Installing MITx pre-requirements"
 pip install -r mitx/pre-requirements.txt >> $LOG
-pip install -r mitx/requirements.txt >>$LOG 
+# Need to be in the mitx dir to get the paths to local modules right
+output "Installing MITx requirements"
+cd mitx
+pip install -r requirements.txt >>$LOG 
 
 mkdir "$BASE/log" || true
 mkdir "$BASE/db" || true
diff --git a/requirements.txt b/requirements.txt
index 27202f0380..3379ab4f68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ mako
 python-memcached
 path.py
 django_debug_toolbar
--e git+git://github.com/MITx/django-pipeline.git#egg=django-pipeline
+-e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
 django-staticfiles>=1.2.1
 fs
 beautifulsoup