From f6c96eae6866c0a6556e649b8f59727838ab1f56 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 28 Nov 2016 13:03:46 +0000
Subject: [PATCH 09/12] travis-ci: run in bash, with the "unofficial strict
 mode"

set -u forces us to set all variables that we use (for example with the
${foo:=bar} syntax to take an existing value or set a default), or use the
${foo:-bar} syntax to make it explicit that the variable might be unset.

set -o pipefail (which is a bash feature) detects failure in non-last
elements of a pipeline.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---
 tools/ci-build.sh | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 7b3b55f..d85b28f 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright © 2015-2016 Collabora Ltd.
 #
@@ -22,27 +22,17 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-set -e
+set -euo pipefail
 set -x
 
-if [ -z "$ci_variant" ]; then
-    ci_variant=production
-fi
-
-if [ -z "$ci_host" ]; then
-    ci_host=native
-fi
-
-if [ -z "$ci_buildsys" ]; then
-    ci_buildsys=autotools
-fi
-
-if [ -z "$ci_parallel" ]; then
-    ci_parallel=1
-fi
-
-ci_test=yes
-ci_test_fatal=yes
+NULL=
+: "${ci_buildsys:=autotools}"
+: "${ci_host:=native}"
+: "${ci_parallel:=1}"
+: "${ci_sudo:=no}"
+: "${ci_test:=yes}"
+: "${ci_test_fatal:=yes}"
+: "${ci_variant:=production}"
 
 NOCONFIGURE=1 ./autogen.sh
 
-- 
2.10.2