From 54655795c9b83b8d942fa114fc18614ed226dcac Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Nov 2016 12:34:06 +0000 Subject: [PATCH] ci-build: consistently use yes/no for booleans, not yes/empty Signed-off-by: Simon McVittie Closes: #600 Approved by: cgwalters --- tests/ci-build.sh | 2 +- tests/ci-install.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ci-build.sh b/tests/ci-build.sh index 4aaa47af..7b98820d 100755 --- a/tests/ci-build.sh +++ b/tests/ci-build.sh @@ -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 \ diff --git a/tests/ci-install.sh b/tests/ci-install.sh index 4aff39e9..8111809f 100755 --- a/tests/ci-install.sh +++ b/tests/ci-install.sh @@ -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