From: Richard Hartmann <richih@debian.org>
Date: Thu, 19 Sep 2013 21:37:33 +0000 (+0200)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/b81e4c5cd981a4ca32317f93510a62d04d1e6456?hp=fd04d0d999f91f024e7abbfe623aa72cbeb95a46

Merge branch 'master' of github.com:RichiH/vcsh
---

diff --git a/vcsh b/vcsh
index 1fc78e2..cf0c8cf 100755
--- a/vcsh
+++ b/vcsh
@@ -365,7 +365,11 @@ write_gitignore() {
 			file="$new"
 		done;
 	done | sort -u)
-	tempfile=$(mktemp) || fatal "could not create tempfile" 51
+
+	# Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
+	# Use the template GNU mktemo defaults to
+	tempfile=$(mktemp tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
+
 	echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
 	for gitignore in $gitignores; do
 		echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57