ci-build: consistently use yes/no for booleans, not yes/empty

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

Closes: #600
Approved by: cgwalters
This commit is contained in:
Simon McVittie authored and Atomic Bot committed 2016-11-29 14:11:50 +00:00
1 parent a73fef3eaa
commit 54655795c9
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -50,7 +50,7 @@ ${make} install DESTDIR=$(pwd)/DESTDIR
( cd DESTDIR && find . ) ( cd DESTDIR && find . )
if [ -n "$ci_sudo" ] && [ -n "$ci_test" ]; then if [ "$ci_sudo" = yes ] && [ "$ci_test" = yes ]; then
sudo ${make} install sudo ${make} install
env \ env \
LD_LIBRARY_PATH=/usr/local/lib \ LD_LIBRARY_PATH=/usr/local/lib \
+2 -2
View File
@@ -5,7 +5,7 @@ set -x
NULL= NULL=
: "${ci_docker:=}" : "${ci_docker:=}"
: "${ci_in_docker:=}" : "${ci_in_docker:=no}"
: "${ci_suite:=jessie}" : "${ci_suite:=jessie}"
if [ $(id -u) = 0 ]; then if [ $(id -u) = 0 ]; then
@@ -66,7 +66,7 @@ case "$ci_distro" in
zlib1g-dev \ zlib1g-dev \
${NULL} ${NULL}
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 # Add the user that we will use to do the build inside the
# Docker container, and let them use sudo # Docker container, and let them use sudo
adduser --disabled-password user </dev/null adduser --disabled-password user </dev/null