diff options
| author | EuAndreh <eu@euandre.org> | 2022-01-20 23:32:37 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2022-01-21 00:00:17 -0300 |
| commit | b4d4c2d50a5072b3c80483e6392fc2b686a355b0 (patch) | |
| tree | 77bcad77cb4a99a9a5d2a3ab90633724c1118ab1 | |
| parent | Add diacritic and spaces to mk{s,d}temp paths to enforce that everything work... (diff) | |
| download | git-permalink-b4d4c2d50a5072b3c80483e6392fc2b686a355b0.tar.gz git-permalink-b4d4c2d50a5072b3c80483e6392fc2b686a355b0.tar.xz | |
{aux,tests}/lib.sh: Use UUIDs for tmpnames to remove dependency on m4
| -rw-r--r-- | aux/containers/guix/manifest.scm | 1 | ||||
| -rwxr-xr-x | aux/lib.sh | 3 | ||||
| -rwxr-xr-x | tests/lib.sh | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/aux/containers/guix/manifest.scm b/aux/containers/guix/manifest.scm index cf9a6d7..32e4418 100644 --- a/aux/containers/guix/manifest.scm +++ b/aux/containers/guix/manifest.scm @@ -6,7 +6,6 @@ diffutils grep sed - m4 git tar gawk @@ -13,8 +13,7 @@ uuid() { } tmpname() { - TEMPLATE="${TMPDIR:-/tmp}/m4-tmpname.diacritic á and spaces." - echo 'mkstemp(template)' | m4 -D template="$TEMPLATE" + echo "${TMPDIR:-/tmp}/uuid-tmpname.diacritic á and spaces.$(uuid)" } mkstemp() { diff --git a/tests/lib.sh b/tests/lib.sh index 0b4bf52..15fe331 100755 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -127,8 +127,7 @@ uuid() { } tmpname() { - TEMPLATE="${TMPDIR:-/tmp}/m4-tmpname.diacritic á and spaces." - echo 'mkstemp(template)' | m4 -D template="$TEMPLATE" + echo "${TMPDIR:-/tmp}/uuid-tmpname.diacritic á and spaces.$(uuid)" } mkstemp() { |