Fixed first stage bugs

This commit is contained in:
Slater-Victoroff
2013-05-31 10:35:26 -04:00
parent b2cd6915e4
commit 49ed93a4e6
2 changed files with 6 additions and 7 deletions

View File

@@ -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

View File

@@ -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 || {