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@xxxxxxxxxxxx>
---
Jonathan Nieder wrote:
> So thinking it through, perhaps we should do the following:
> - provide a simple mini-mktemp for users to install themselves
> on old systems
> - always provide the template argument to mktemp
Here's the second part. With this change, plus a sed
portability fix I will send separately, topgit on Mac OS X
works. Thanks for the help.
tg-export.sh | 2 +-
tg-info.sh | 2 +-
tg-patch.sh | 2 +-
tg-update.sh | 2 +-
tg.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tg-export.sh b/tg-export.sh
index 62361dd..62ea4f9 100644
--- 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 43589f9..f2b6365 100644
--- 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 04023c0..48f4d77 100644
--- 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 27a8e81..50b29b4 100644
--- 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 e5766fe..1bc886a 100644
--- 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
--
tg: (f27e693..) t/topgit/mktemp-template (depends on: )
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
