Commit 49ed93a4 by Slater-Victoroff

Fixed first stage bugs

parent b2cd6915
...@@ -227,10 +227,8 @@ case `uname -s` in ...@@ -227,10 +227,8 @@ case `uname -s` in
distro=`lsb_release -cs` distro=`lsb_release -cs`
case $distro in case $distro in
wheezy|jessie|maya|olivia|nadia|natty|precise|quantal|raring) wheezy|jessie|maya|olivia|nadia|natty|precise|quantal|raring)
sudo apt-get install git sudo apt-get install git ;;
;;
case $distro in
squeeze|lisa|katya|oneiric|natty) squeeze|lisa|katya|oneiric|natty)
warning "It seems like you're using $distro which has been deprecated. warning "It seems like you're using $distro which has been deprecated.
While we don't technically support this release, the install While we don't technically support this release, the install
...@@ -240,6 +238,7 @@ case `uname -s` in ...@@ -240,6 +238,7 @@ case `uname -s` in
read dummy read dummy
sudo apt-get install git sudo apt-get install git
;; ;;
*) *)
error "Unsupported distribution - $distro" error "Unsupported distribution - $distro"
exit 1 exit 1
...@@ -287,7 +286,7 @@ esac ...@@ -287,7 +286,7 @@ esac
clone_repos clone_repos
# Sanity check to make sure the repo layout hasn't changed # 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" output "Installing system-level dependencies"
bash $BASE/edx-platform/scripts/install-system-req.sh bash $BASE/edx-platform/scripts/install-system-req.sh
else else
......
...@@ -17,7 +17,7 @@ output() { ...@@ -17,7 +17,7 @@ output() {
### START ### START
SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 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" BREW_FILE=$REQUIREMENTS_DIR/"mac_os_x/brew-formulas.txt"
APT_REPOS_FILE=$REQUIREMENTS_DIR/"ubuntu/apt-repos.txt" APT_REPOS_FILE=$REQUIREMENTS_DIR/"ubuntu/apt-repos.txt"
APT_PKGS_FILE=$REQUIREMENTS_DIR/"ubuntu/apt-packages.txt" APT_PKGS_FILE=$REQUIREMENTS_DIR/"ubuntu/apt-packages.txt"
...@@ -78,7 +78,7 @@ EO ...@@ -78,7 +78,7 @@ EO
# for some reason openssl likes to be installed by itself first # for some reason openssl likes to be installed by itself first
brew install openssl brew install openssl
# brew errors if the package is already installed # brew errors if the package is already installed
for pkg in $(cat $BREW_FILE); do for pkg in $(cat $BREW_FILE); do
grep $pkg <(brew list) &>/dev/null || { grep $pkg <(brew list) &>/dev/null || {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment