From 6aea5ce814c0723474e0741df45dbf2c202ba739 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 5 Jun 2023 22:48:06 +0100 Subject: [PATCH] tests: fix shellcheck warnings --- test/hwdb-test.sh | 6 +++--- test/test-sysusers.sh.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh index 3efbad21b6f..432a49fa1b4 100755 --- a/test/hwdb-test.sh +++ b/test/hwdb-test.sh @@ -28,11 +28,11 @@ cp -a "$ROOTDIR/hwdb.d" "$D/etc/udev/hwdb.d" err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$? if [ -n "$err" ]; then echo "$err" - exit ${rc:-1} + exit "${rc:-1}" fi if [ -n "$rc" ]; then echo "$SYSTEMD_HWDB returned $rc" - exit $rc + exit "$rc" fi if [ ! -e "$D/etc/udev/hwdb.bin" ]; then @@ -47,7 +47,7 @@ cp -a "$ROOTDIR/test/hwdb.d" "$D/etc/udev/hwdb.d" err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$? if [ -n "$rc" ]; then echo "$SYSTEMD_HWDB returned $rc" - exit $rc + exit "$rc" fi if [ -n "$err" ]; then echo "Expected warnings" diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in index 3bcc87561fd..5d66c6776d2 100755 --- a/test/test-sysusers.sh.in +++ b/test/test-sysusers.sh.in @@ -140,7 +140,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do # shellcheck disable=SC2050 [ @ENABLE_COMPAT_MUTABLE_UID_BOUNDARIES@ = 1 ] && bound=555 || bound=$system_guid_max - compare "${f%.*}" "(with login.defs)" $bound + compare "${f%.*}" "(with login.defs)" "$bound" done rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/* @@ -156,7 +156,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do # shellcheck disable=SC2050 [ @ENABLE_COMPAT_MUTABLE_UID_BOUNDARIES@ = 1 ] && bound=555 || bound=$system_guid_max - compare "${f%.*}" "(with login.defs symlinked)" $bound + compare "${f%.*}" "(with login.defs symlinked)" "$bound" done rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/* -- 2.47.3