Reorganized Travis script to use a common SH_PREFIX

Author: lgeretti

.travis.yml

@@ -31,18 +31,17 @@ matrix:
         - docker
       env: DOCKER=ubuntu:latest COMPILER=c++ COVERAGE=ON
 
-
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew cask uninstall --force oclint; ./install-macos-deps.sh; fi
   - |
     if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       if [[ -n "$DOCKER" ]]; then
         docker pull $DOCKER
         CONTAINER_ID=$(docker run --detach --tty --volume="$PWD":/ariadne --workdir=/ariadne $DOCKER)
-        DOCKER_RUN="docker exec --tty $CONTAINER_ID"
-        $DOCKER_RUN sh -c "apt update"
-        $DOCKER_RUN sh -c "apt install -y curl cmake"
-        $DOCKER_RUN sh -c "apt install -y clang++-5.0 libboost-system-dev libboost-serialization-dev libboost-thread-dev libgtk2.0-dev libcairo2-dev libbdd-dev"   
+        SH_PREFIX="docker exec --tty $CONTAINER_ID"
+        $SH_PREFIX sh -c "apt update"
+        $SH_PREFIX sh -c "apt install -y curl cmake"
+        $SH_PREFIX sh -c "apt install -y clang++-5.0 libboost-system-dev libboost-serialization-dev libboost-thread-dev libgtk2.0-dev libcairo2-dev libbdd-dev"   
       else 
         sudo apt-get install -y libboost-system-dev libboost-serialization-dev libboost-thread-dev libgtk2.0-dev libcairo2-dev libbdd-dev
       fi
@@ -51,16 +50,9 @@ before_install:
 script:
   - CMAKE_ARGS="-DCMAKE_CXX_COMPILER=$COMPILER"
   - if [[ -n "$COVERAGE" ]]; then CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug"; fi
-  - if [[ -n "$DOCKER" ]]; then $DOCKER_RUN sh -c "cmake . $CMAKE_ARGS"; fi
-  - if [[ -z "$DOCKER" ]]; then cmake . $CMAKE_ARGS; fi
-  - |
-    if [[ -n "$DOCKER" ]]; then 
-      $DOCKER_RUN sh -c "make tests"
-      $DOCKER_RUN sh -c "make test"
-    else
-      make tests
-      make test
-    fi 
+  - $SH_PREFIX sh -c "cmake . $CMAKE_ARGS"
+  - $SH_PREFIX sh -c "make tests"
+  - $SH_PREFIX sh -c "make test"
 
 after_success:
   - if [[ -n "$COVERAGE" ]]; then bash <(curl -s https://codecov.io/bash); fi