From 2b5f2366ee3e33eafca041316053a15e42ad0728 Mon Sep 17 00:00:00 2001
From: Andrew Kane <acekane1@gmail.com>
Date: Tue, 18 Nov 2014 22:04:46 -0800
Subject: [PATCH] Moved all before install commands into script

---
 .travis.yml          |  3 +--
 ci/before_install.sh | 14 ++++++++++++++
 ci/nobrainer.sh      | 10 ----------
 3 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100755 ci/before_install.sh
 delete mode 100755 ci/nobrainer.sh

diff --git a/.travis.yml b/.travis.yml
index 5da0f53..01f9955 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,7 @@ services:
   - elasticsearch
   - mongodb
 before_install:
-  - wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb && sudo dpkg -i elasticsearch-1.3.2.deb && sudo service elasticsearch restart
-  - ./ci/nobrainer.sh
+  - ./ci/before_install.sh
 script: bundle exec rake test
 before_script:
   - psql -c 'create database searchkick_test;' -U postgres
diff --git a/ci/before_install.sh b/ci/before_install.sh
new file mode 100755
index 0000000..ed22533
--- /dev/null
+++ b/ci/before_install.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb
+sudo dpkg -i elasticsearch-1.3.2.deb
+sudo service elasticsearch restart
+
+if [ -n "$NOBRAINER" ]; then
+  source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+  wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+  sudo apt-get update -q
+  sudo apt-get install rethinkdb
+  sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
+  sudo service rethinkdb restart
+fi
diff --git a/ci/nobrainer.sh b/ci/nobrainer.sh
deleted file mode 100755
index e80c6c5..0000000
--- a/ci/nobrainer.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -n "$NOBRAINER" ]; then
-  source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
-  wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
-  sudo apt-get update -q
-  sudo apt-get install rethinkdb
-  sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
-  sudo service rethinkdb restart
-fi
--
libgit2 0.21.0