]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
ci-install.sh: make ci_in_docker follow the yes/no convention too
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 29 Nov 2016 12:47:01 +0000 (12:47 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 29 Nov 2016 12:47:49 +0000 (12:47 +0000)
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98889

tools/ci-install.sh

index 3fc5ffb20f41dc4918d7f093cfe956d72e592b40..ddab0467a1b095d57275465e9665e096aad1e0f8 100755 (executable)
@@ -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