From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 29 Nov 2016 12:47:01 +0000 (+0000)
Subject: ci-install.sh: make ci_in_docker follow the yes/no convention too
X-Git-Tag: dbus-1.10.16~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7c048f36a196eda3fcf6a0136f234224980abe8;p=thirdparty%2Fdbus.git

ci-install.sh: make ci_in_docker follow the yes/no convention too

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98889
---

diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index 3fc5ffb20..ddab0467a 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -29,7 +29,7 @@ NULL=
 : "${ci_distro:=ubuntu}"
 : "${ci_docker:=}"
 : "${ci_host:=native}"
-: "${ci_in_docker:=}"
+: "${ci_in_docker:=no}"
 : "${ci_suite:=trusty}"
 
 if [ $(id -u) = 0 ]; then
@@ -111,7 +111,7 @@ case "$ci_distro" in
                 ;;
         esac
 
-        if [ -n "$ci_in_docker" ]; then
+        if [ "$ci_in_docker" = yes ]; then
             # Add the user that we will use to do the build inside the
             # Docker container, and let them use sudo
             adduser --disabled-password user </dev/null