From 53119f0bca57ea0166f824e2935553feaebd208d Mon Sep 17 00:00:00 2001
From: Tadas Baltrusaitis <tadyla@gmail.com>
Date: Tue, 20 Dec 2016 17:46:48 -0500
Subject: [PATCH] Travis test

---
 .travis.yml | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 195f22d..0759472 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,24 +31,28 @@ before_install:
   - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get update -qq; fi
   
 install:
-  - if [ "$CXX" = "g++" ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install -qq g++-4.8; fi fi
-  - if [ "$CXX" = "g++" ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then export CXX="g++-4.8"; fi fi 
-  - if [ "$CXX" = "clang++" ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install -qq clang-3.4; fi fi
-  - if [ "$CXX" = "clang++" ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then export CXX="clang++-3.4"; fi fi
-
-  - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev; fi
-  - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall; fi
-    
-   # Getting newest boost
-  - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo add-apt-repository -y ppa:boost-latest/ppa; fi
-  - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get update; fi
-  - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install libboost1.55-all-dev; fi
-  
-  - if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew update; fi
-  - if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew tap homebrew/science; fi
-  - if [[ ${TRAVIS_OS_NAME} = osx ]]; then /usr/bin/yes | pip uninstall numpy; fi
-  - if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew install tbb opencv3; fi
 
+  - 'if [ ${TRAVIS_OS_NAME} = linux ]; then
+        if [ "$CXX" = "g++" ]; then 
+            sudo apt-get install -qq g++-4.8; 
+            export CXX="g++-4.8";
+        else
+            sudo apt-get install -qq clang-3.4;
+            export CXX="clang++-3.4";
+        fi;
+        sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
+        sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall;
+        # Getting newest boost
+        sudo add-apt-repository -y ppa:boost-latest/ppa;
+        sudo apt-get update;
+        sudo apt-get install libboost1.55-all-dev;
+    else
+        brew update;
+        brew tap homebrew/science;
+        /usr/bin/yes | pip uninstall numpy;
+        brew install tbb
+    fi'
+      
   # Installing openCV 3.1
   - wget https://github.com/Itseez/opencv/archive/3.1.0.zip
   - sudo unzip 3.1.0.zip