From 49787ab49be82ce3ed1527b662d022bed3e7c8b9 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 31 Mar 2023 19:26:53 -0300 Subject: Do not depend on m4 for anything --- tests/lib.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tests/lib.sh') diff --git a/tests/lib.sh b/tests/lib.sh index 527e645..d144bef 100755 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -119,26 +119,23 @@ test_ok() { } uuid() { - # Taken from: - # https://serverfault.com/a/799198 od -xN20 /dev/urandom | - head -1 | + head -n1 | awk '{OFS="-"; print $2$3,$4,$5,$6,$7$8$9}' } tmpname() { - echo 'mkstemp(template)' | m4 -D template="${TMPDIR:-/tmp}/m4-tmpname." + printf '%s/uuid-tmpname with spaces.%s' "${TMPDIR:-/tmp}" "$(uuid)" } mkstemp() { name="$(tmpname)" - touch "$name" - echo "$name" + touch -- "$name" + printf '%s' "$name" } mkdtemp() { name="$(tmpname)" - rm -f "$name" - mkdir "$name" - echo "$name" + mkdir -- "$name" + printf '%s' "$name" } -- cgit v1.2.3