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:
parent
a73fef3eaa
commit
54655795c9
|
|
@ -50,7 +50,7 @@ ${make} install DESTDIR=$(pwd)/DESTDIR
|
|||
|
||||
( cd DESTDIR && find . )
|
||||
|
||||
if [ -n "$ci_sudo" ] && [ -n "$ci_test" ]; then
|
||||
if [ "$ci_sudo" = yes ] && [ "$ci_test" = yes ]; then
|
||||
sudo ${make} install
|
||||
env \
|
||||
LD_LIBRARY_PATH=/usr/local/lib \
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ set -x
|
|||
|
||||
NULL=
|
||||
: "${ci_docker:=}"
|
||||
: "${ci_in_docker:=}"
|
||||
: "${ci_in_docker:=no}"
|
||||
: "${ci_suite:=jessie}"
|
||||
|
||||
if [ $(id -u) = 0 ]; then
|
||||
|
|
@ -66,7 +66,7 @@ case "$ci_distro" in
|
|||
zlib1g-dev \
|
||||
${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
|
||||
# Docker container, and let them use sudo
|
||||
adduser --disabled-password user </dev/null
|
||||
|
|
|
|||
Loading…
Reference in New Issue