Clean up Travis config

Author: tamird

.travis.yml

@@ -2,32 +2,7 @@ language: ruby
 bundler_args: --without benchmarks development
 before_install:
   - gem --version
-  - |
-    bash -c " # Install MySQL 5.7 if DB=mysql57
-    if [[ x$DB =~ mysql57 ]]; then
-      sudo bash .travis_mysql57.sh
-    fi
-    "
-  - |
-    bash -c " # Install MariaDB if DB=mariadb
-    if [[ x$DB =~ xmariadb ]]; then
-      sudo bash .travis_mariadb.sh '$DB'
-    fi
-    "
-  - |
-    bash -c " # Install MySQL if OS=darwin
-    if [[ x$OSTYPE =~ ^xdarwin ]]; then
-      brew install mysql
-      mysql.server start
-    fi
-    "
-  - |
-    bash -c " # Configure SSL support
-    if [[ ! x$OSTYPE =~ ^xdarwin ]]; then
-      sudo bash .travis_ssl.sh
-      sudo service mysql restart
-    fi
-    "
+  - bash .travis_setup.sh
   - mysqld --version
   - mysql -u root -e "CREATE DATABASE IF NOT EXISTS test"
   - mysql -u root -e "CREATE USER '$USER'@'localhost'" || true

.travis_mariadb.sh

@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
+set -eu
 
 service mysql stop
 apt-get purge '^mysql*' 'libmysql*'
-apt-get install python-software-properties
 apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
 
 if [[ x$1 = xmariadb55 ]]; then

.travis_mysql57.sh

@@ -1,15 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-service mysql stop
+set -eu
 
+service mysql stop
 apt-get purge '^mysql*' 'libmysql*'
-apt-get autoclean
-
-rm -rf /var/lib/mysql
-rm -rf /var/log/mysql
-
-apt-get install python-software-properties
 apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x8C718D3B5072E1F5
+
 add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.7-dmr'
 
 apt-get update

.travis_setup.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -eu
+
+# Install MySQL 5.7 if DB=mysql57
+if [[ -n ${DB-} && x$DB =~ mysql57 ]]; then
+  sudo bash .travis_mysql57.sh
+fi
+
+# Install MariaDB if DB=mariadb
+if [[ -n ${DB-} && x$DB =~ xmariadb ]]; then
+  sudo bash .travis_mariadb.sh "$DB"
+fi
+
+# Install MySQL if OS=darwin
+if [[ x$OSTYPE =~ ^xdarwin ]]; then
+  brew install mysql
+  mysql.server start
+fi
+
+# TODO: get SSL working on OS X in Travis
+if ! [[ x$OSTYPE =~ ^xdarwin ]]; then
+  sudo bash .travis_ssl.sh
+  sudo service mysql restart
+fi

.travis_ssl.sh

@@ -1,7 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-# Halt the tests on error
-set -e
+set -eu
 
 # Wherever MySQL configs live, go there (this is for cross-platform)
 cd $(my_print_defaults --help | grep my.cnf | xargs find 2>/dev/null | xargs dirname)