supply template argument to mktemp

mktemp versions before 1.5 did not allow omitting the template
(prefix.XXXXXX) argument.  Thus on Mac OS X,

	$ mktemp -d
	usage: mktemp [-d] [-q] [-t prefix] [-u] template ...
	       mktemp [-d] [-q] [-u] -t prefix

So supply a filename template.  To maintain the intended
behavior, we have to add -t, too.  It was implied before.

Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>

diff --git a/tg-export.sh b/tg-export.sh
index 62361dd9b5abe721d2e5e1359df238798dcbcc54..62ea4f97f732b0d0f27e7b98ed742a7c8f5503ba 100644 (file)
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -32,7 +32,7 @@ base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)"
        die "not on a TopGit-controlled branch"
 
 
-playground="$(mktemp -d)"
+playground="$(mktemp -d -t tg-export.XXXXXX)"
 trap 'rm -rf "$playground"' EXIT
 
 

diff --git a/tg-info.sh b/tg-info.sh
index 43589f9e635c82d908590be37f9d2ee931d6d1ba..f2b636533a78e1d9d87b4e6507e0d05ed543162a 100644 (file)
--- a/tg-info.sh
+++ b/tg-info.sh
@@ -41,7 +41,7 @@ branch_contains "$name" "$base_rev" ||
 git cat-file blob "$name:.topdeps" |
        sed '1{s/^/Depends: /;n}; s/^/         /;'
 
-depcheck="$(mktemp)"
+depcheck="$(mktemp -t tg-depcheck.XXXXXX)"
 missing_deps=
 needs_update "$name" >"$depcheck" || :
 if [ -n "$missing_deps" ]; then

diff --git a/tg-patch.sh b/tg-patch.sh
index 04023c05234d938d10acfb112a77554e7c0425f8..48f4d770059bc7e7cb99bd8b005ad1ae1aeb932e 100644 (file)
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -29,7 +29,7 @@ echo
 [ -n "$(git grep '^[-]--' "$name" -- ".topmsg")" ] || echo '---'
 
 # Evil obnoxious hack to work around the lack of git diff --exclude
-git_is_stupid="$(mktemp)"
+git_is_stupid="$(mktemp -t tg-patch-changes.XXXXXX)"
 git diff-tree --name-only "$base_rev" "$name" |
        fgrep -vx ".topdeps" |
        fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly?

diff --git a/tg-update.sh b/tg-update.sh
index 27a8e81086f7eb71ba4c4c4d0e19aeabd6842a09..50b29b426ac46acb8a427bc88d934ef5c57e3b23 100644 (file)
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -21,7 +21,7 @@ base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)"
 
 ## First, take care of our base
 
-depcheck="$(mktemp)"
+depcheck="$(mktemp -t tg-depcheck.XXXXXX)"
 missing_deps=
 needs_update "$name" >"$depcheck" || :
 [ -z "$missing_deps" ] || die "some dependencies are missing: $missing_deps"

diff --git a/tg.sh b/tg.sh
index e5766fe8cc5b460a09a6ea4d5e9e105dc64d74a9..1bc886aaee7bbcd2444e8950769b2b8932a7bbc3 100644 (file)
--- a/tg.sh
+++ b/tg.sh
@@ -95,7 +95,7 @@ recurse_deps()
        _cmd="$1"; shift
        _name="$1"; # no shift
        _depchain="$*"
-       _depsfile="$(mktemp)"
+       _depsfile="$(mktemp -t tg-depsfile.XXXXXX)"
        git cat-file blob "$_name:.topdeps" >"$_depsfile"
        _ret=0
        while read _dep; do