diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-28 12:34:06 +0000 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-11-29 14:11:50 +0000 |
| commit | 54655795c9b83b8d942fa114fc18614ed226dcac (patch) | |
| tree | 303eef6eb84ef1f09a528ad907f7d7efd6c4cfde | |
| parent | a73fef3eaacdf7fb902f096d60371cdbdc015181 (diff) | |
| download | ostree-54655795c9b83b8d942fa114fc18614ed226dcac.tar.gz | |
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
| -rwxr-xr-x | tests/ci-build.sh | 2 | ||||
| -rwxr-xr-x | 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 </dev/null |