From 5b544e958129a6d72fc2bc7e4f29ebb7249a0625 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Thu, 15 Dec 2016 20:22:42 +0100
Subject: [PATCH] fix(ci): Match any clang binary

---
 common/travis/build.sh          | 2 +-
 common/travis/configure.sh      | 2 +-
 common/travis/environment.sh    | 4 ++--
 common/travis/install_cmake.sh  | 2 +-
 common/travis/install_libcpp.sh | 4 ++--
 common/travis/summary.sh        | 2 +-
 common/travis/tests.sh          | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/travis/build.sh b/common/travis/build.sh
index a3dc4e12..c73c7fb7 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/bin/bash
 cd "${TRAVIS_BUILD_DIR}/build" && make -j"${JOBS}"
diff --git a/common/travis/configure.sh b/common/travis/configure.sh
index d850e8f2..28e2248c 100755
--- a/common/travis/configure.sh
+++ b/common/travis/configure.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 mkdir -p "${TRAVIS_BUILD_DIR}/build"
 cd "${TRAVIS_BUILD_DIR}/build" || false
 cmake \
diff --git a/common/travis/environment.sh b/common/travis/environment.sh
index eed2f1d8..23dcac02 100755
--- a/common/travis/environment.sh
+++ b/common/travis/environment.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 export DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
 export LLVM_ROOT="${DEPS_DIR}/llvm-${LLVM_VERSION}"
 
@@ -6,7 +6,7 @@ mkdir -p "${DEPS_DIR}"
 mkdir -p "${LLVM_ROOT}"
 
 # Update compiler flags
-if [ "${CXX}" = "clang++" ]; then
+if [ "${CXX:0:7}" = "clang++" ]; then
   export CXX="clang++-3.8"
   export CC="clang-3.8"
   export CXXFLAGS="${CXXFLAGS} -Qunused-arguments"
diff --git a/common/travis/install_cmake.sh b/common/travis/install_cmake.sh
index a2842fa3..bd681353 100755
--- a/common/travis/install_cmake.sh
+++ b/common/travis/install_cmake.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 if [ -z "$(ls -A "${DEPS_DIR}/cmake/bin" 2>/dev/null)" ]; then
   mkdir -p cmake && travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
 fi
diff --git a/common/travis/install_libcpp.sh b/common/travis/install_libcpp.sh
index 31ae3886..d66d2231 100755
--- a/common/travis/install_libcpp.sh
+++ b/common/travis/install_libcpp.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-if [ "${CXX}" = "clang++" ]; then
+#!/bin/bash
+if [ "${CXX:0:7}" = "clang++" ]; then
   if [ -z "$(ls -A "${LLVM_ROOT}/install/include" 2>/dev/null)" ]; then
     mkdir -p "${LLVM_ROOT}" "${LLVM_ROOT}/build" "${LLVM_ROOT}/projects/libcxx" "${LLVM_ROOT}/projects/libcxxabi"
 
diff --git a/common/travis/summary.sh b/common/travis/summary.sh
index 51c3e392..39e6a6e0 100755
--- a/common/travis/summary.sh
+++ b/common/travis/summary.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 echo "${CXX} --version"
 eval "${CXX} --version"
 
diff --git a/common/travis/tests.sh b/common/travis/tests.sh
index 89fedc6d..5888f334 100755
--- a/common/travis/tests.sh
+++ b/common/travis/tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 if [ "${BUILD_TESTS:-OFF}" = "ON" ]; then
   for test in tests/unit_test.*; do
     [ -x "$test" ] || continue