Moved download and install of astyle into before_install section. Renamed files.

diff --git a/.travis.yml b/.travis.yml
index e069ae550787fbf6553eee85c204f22145e93560..aa013ce4823cd1bcd71a7144d262620df29ffa60 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,9 @@ language: C++
 compiler: 
 - gcc
 
-script: ./contrib/utilities/run_travis.sh 
+before_install: ./contrib/utilities/setup_astyle.sh 
+
+script: ./contrib/utilities/check_indentation.sh 
 
 branches:
   only:

diff --git a/contrib/utilities/run_travis.sh b/contrib/utilities/check_indentation.sh
similarity index 58%
rename from contrib/utilities/run_travis.sh
rename to contrib/utilities/check_indentation.sh
index a6b2ca58ca3142e56a890d9463bfcf24f16db604..abca0273180a018069aaa097606d9208c898bbfe 100755 (executable)
--- a/contrib/utilities/run_travis.sh
+++ b/contrib/utilities/check_indentation.sh
@@ -6,12 +6,8 @@ else
        echo "Running indentation test on Pull Request #${TRAVIS_PULL_REQUEST}"
 fi
 
-wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz > /dev/null
-tar xvfz astyle_2.04_linux.tar.gz > /dev/null
-cd astyle/build/gcc
-make -j4 > /dev/null
-cd ../../../
 export PATH=`pwd`/astyle/build/gcc/bin:$PATH
+
 ./contrib/utilities/indent
 git diff
 git diff-files --quiet 

diff --git a/contrib/utilities/setup_astyle.sh b/contrib/utilities/setup_astyle.sh
new file mode 100755 (executable)
index 0000000..cb14885
--- /dev/null
+++ b/contrib/utilities/setup_astyle.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo "Downloading and installing astyle."
+wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz  > /dev/null
+tar xvfz astyle_2.04_linux.tar.gz > /dev/null
+cd astyle/build/gcc
+make -j4 > /dev/null
+cd ../../../
+export PATH=`pwd`/astyle/build/gcc/bin:$PATH