[travis] combine scripts

.travis.yml

@@ -15,16 +15,10 @@ env:
     - secure: 'kpwd5Wl7rlVBoNzVvhU7A8FN7lIxjoL1V5gCQSdKU7FJD5SHMXctBkaw1mcvpwMqDjcvX0XCcvPyCToe2yzdRRLif8cJJqVC/CMcArkLoyhhBcqBjw9Fq3Qaj2eZZW8K0T3Ie2rLu0n3XmAW9HGUa2osc9sALXxDYwZSW+Tk4AjwcXdTzkonQe9sz+oYhOpYMX8qhjJ7LJk4sdEInemnoK0vjRTIu/9ndUcFe5WpJaNMo+k3GhfM4r+Kvv26l0m/j+daVOALzBcLTLn6XgTo0/YkTGl+50VPYhz8WbYAPWa02JzwXOzfezxe3UQDzWClU+G1CpnBpAOsvqj4Q54ccqZTrFOXvvH61n9aSI/WxFxSWRka3crGjmr//jcGfTr2dIi5YmDtDv7vD2cRzy2Gh3xZe7FtfyXMIDSiXpZ52Dq+ZESKPlWOWfYhncQ7dwj+xptqpPsZXFFI6dA5QqfGJYq8Wtelu0o8bSwSdFEUE4y656/sY4pOGpXpE/jZ091kFCQQTHb2bjXl8asKeA7FBkSJKbbaJeyQ56y3PMmn7OqPDMtzOKTtK9MDrK0fiaZUDgEMp7AOzHMViFX3vSH/u1rX+3UfkYCeKW52bK4xiGQKpsmNIK3BCqIjJfX17qW5GOgSjsAnfWTT81rdcydpf0rxI3JWse65ZMAHudNn/2k='
     - secure: 'y+crCYO9hfMVE8PYe3hTpxsLQzg0zc4AWPyUClmdHUA+VvH3pPw7gtJNpO+D51IrR82pDMBrDcUH1KaEcAsN2rKDG5yLbwrt7/n2nnzFfnvUY0tA/MyR+gcu/lrjNid8VpttW5C0GF2BPkzRSy+MKfa47Iodu7OTndr3ie8KRJpjJ+R8AnSU+wIRyCe+aE5ttMHKEx7TC3ItjtGrUuwZL0lJv0OBYenRzU1QhZBR5+0Wh0yHpOdHcwhQGuutjyYC1g4iDEBygBUTWK69nEIFknUv46gAAOXk53cj9IFTeMhnUL/SFepelxMVI8Z5YrzFS0S6hQp8zliO5iv6f1H0xT6V2plngBKLP+ZzUkJdzAU1RB2Ukj3VBsEAR3PZir9nVnf+OxZhmDqiaI1uaDtCWOGA4tzeYa6jtbbrOY/7ouTCzxCHJwZia7rpH4cIHTgluVypm9wMxMcxdEB0noowEnn2miaQYB/4/FP5KNnqMC7mjT/RXDQd3LTgospLMmZDDPC26lnW841pAEA/RjbdDOhlBrN4IDSP7Jv4gYXhSHwuxEzH26LciWy/4AKz/tuQhw3Gzw3epHBYUo3iH/GQ02OTSTXmJ5Dyuv3PfZYCe0nY0J4p8yEM8otGX3qd9nAKYjEnnXta6AvSZr5nL99MHQzLtEySYsr/mPFC2SEjSMw='
 
-before_install:
-  - "[ ${CONSUMER_KEY} ] && ./bin/travis/before_install.sh"
-
 install:
   - wget https://dl.google.com/closure-compiler/compiler-latest.zip
   - unzip -n compiler-latest.zip
-  - npm install
-
-before_script:
-  - "[ ${CONSUMER_KEY} ] && ./bin/travis/before_script.sh"
+  - "[ ${CONSUMER_KEY} ] && ./bin/travis/install.sh"
 
 script:
   # TODO: Enable checkTypes after adding more types to externs.js

bin/travis/install.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+cd "$(dirname ${BASH_SOURCE[0]})/../../"
+
+sudo install -o "$USER" -d /etc/blocktogether
+sudo install -o "$USER" -d /data/blocktogether
+
+cp -a ./config/* /etc/blocktogether/
+sed "s/__CONSUMER_KEY__/$CONSUMER_KEY/" ./config/development.json > /etc/blocktogether/config.json
+sed -i "s/__CONSUMER_SECRET__/$CONSUMER_SECRET/" /etc/blocktogether/config.json
+
+mysqladmin -u root password "$DB_ROOT_PASS"
+sudo ./bin/setup.sh
+
+npm install
+
+./node_modules/.bin/sequelize --config /etc/blocktogether/sequelize.json db:migrate
+
+./run-dev.sh > bt.log 2>&1 &
+
+until curl localhost:3000; do echo "Waiting for service..."; sleep 1; done