From 49ed93a4e6d1a5afd1e88c7cd9be6ae6ea47e747 Mon Sep 17 00:00:00 2001 From: Slater-Victoroff Date: Fri, 31 May 2013 10:35:26 -0400 Subject: [PATCH] Fixed first stage bugs --- scripts/create-dev-env.sh | 9 ++++----- scripts/install-system-req.sh | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/create-dev-env.sh b/scripts/create-dev-env.sh index 0cade95a45..2038078307 100755 --- a/scripts/create-dev-env.sh +++ b/scripts/create-dev-env.sh @@ -227,10 +227,8 @@ case `uname -s` in distro=`lsb_release -cs` case $distro in - wheezy|jessie|maya|olivia|nadia|natty|precise|quantal|raring) - sudo apt-get install git - ;; - case $distro in + wheezy|jessie|maya|olivia|nadia|natty|precise|quantal|raring) + sudo apt-get install git ;; squeeze|lisa|katya|oneiric|natty) warning "It seems like you're using $distro which has been deprecated. While we don't technically support this release, the install @@ -240,6 +238,7 @@ case `uname -s` in read dummy sudo apt-get install git ;; + *) error "Unsupported distribution - $distro" exit 1 @@ -287,7 +286,7 @@ esac clone_repos # Sanity check to make sure the repo layout hasn't changed -if [[ -d $BASE/edx-platform/scripts]]; then +if [[ -d $BASE/edx-platform/scripts ]]; then output "Installing system-level dependencies" bash $BASE/edx-platform/scripts/install-system-req.sh else diff --git a/scripts/install-system-req.sh b/scripts/install-system-req.sh index a8300e7b97..3a9281bf8d 100755 --- a/scripts/install-system-req.sh +++ b/scripts/install-system-req.sh @@ -17,7 +17,7 @@ output() { ### START SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -REQUIREMENTS_DIR=$DIR/"requirements/system" +REQUIREMENTS_DIR="$SELF_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" @@ -78,7 +78,7 @@ EO # for some reason openssl likes to be installed by itself first brew install openssl - + # brew errors if the package is already installed for pkg in $(cat $BREW_FILE); do grep $pkg <(brew list) &>/dev/null || {