1 files changed, 6 insertions, 9 deletions
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"
 }