travis: move all commands in install section to shell script

mroonga · Oct 23, 2012 · 0f516f0 · 0f516f0
1 parent b5733c7
commit 0f516f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,7 @@ env:
   - MYSQL_VERSION=5.5.27
   - MARIADB_VERSION=5.5.25
 install:
-  - curl https://raw.github.com/groonga/groonga/master/data/travis/setup.sh | sh
-  - curl https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh
-  - sudo apt-get -y install groonga-tokenizer-mecab
-  - tools/travis/install_mysql.sh
+  - tools/travis/install.sh
 before_script:
   - tools/travis/before_script.sh
 script:

diff --git a/tools/travis/install_mysql.sh → tools/travis/install.sh b/tools/travis/install_mysql.sh → tools/travis/install.sh
@@ -3,6 +3,10 @@
 set -x
 set -e
 
+curl https://raw.github.com/groonga/groonga/master/data/travis/setup.sh | sh
+curl https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh
+sudo apt-get -y install groonga-tokenizer-mecab
+
 mkdir -p vendor
 cd vendor
 if [ "$MYSQL_VERSION" = "system" ]; then