From 5883ee8a5a24cc078a78a4c8fc7a6ce144bea770 Mon Sep 17 00:00:00 2001
From: Slater-Victoroff <slater.r.victoroff@gmail.com>
Date: Thu, 30 May 2013 15:03:48 -0400
Subject: [PATCH] Added directory structure tests

---
 scripts/create-dev-env.sh     | 6 ++++--
 scripts/install-system-req.sh | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/create-dev-env.sh b/scripts/create-dev-env.sh
index a8c7299612..3168cb43e3 100755
--- a/scripts/create-dev-env.sh
+++ b/scripts/create-dev-env.sh
@@ -286,9 +286,11 @@ esac
 
 clone_repos
 
+# Sanity check to make sure the repo layout hasn't changed
+if [[ -d $BASE/edx_platform/scripts]]; then
+    ouput "Installing system-level dependencies"
+
 # Install system-level dependencies
-if [[ -d $BASE/edx_platform/scripts/install-system-req.sh]]; then
-    
 bash $BASE/edx_platform/scripts/install-system-req.sh
 
 output "Installing RVM, Ruby, and required gems"
diff --git a/scripts/install-system-req.sh b/scripts/install-system-req.sh
index 976fa1532b..499b0f4f96 100755
--- a/scripts/install-system-req.sh
+++ b/scripts/install-system-req.sh
@@ -16,10 +16,11 @@ output() {
 
 ### START
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-BREW_FILE=$DIR/"brew-formulas.txt"
-APT_REPOS_FILE=$DIR/"apt-repos.txt"
-APT_PKGS_FILE=$DIR/"apt-packages.txt"
+SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REQUIREMENTS_DIR=$DIR/"requirements/system"
+BREW_FILE=$REQUIREMENTS_DIR/"mac_os_x/brew-formulas.txt"
+APT_REPOS_FILE=$REQUIREMENTS_DIR/"ubuntu/apt-repos.txt"
+APT_PKGS_FILE=$REQUIREMENTS_DIR/"ubuntu/apt-packages.txt"
 
 case `uname -s` in
     [Ll]inux)