From: Tim Otten <totten@civicrm.org>
Date: Tue, 23 Apr 2013 22:11:23 +0000 (-0700)
Subject: merge-forward: Fix for OS X mktemp
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;ds=sidebyside;h=1feadff32a4a15b4dce870779eb86e25676f6e10;p=civicrm-core.git

merge-forward: Fix for OS X mktemp
---

diff --git a/tools/scripts/merge-forward b/tools/scripts/merge-forward
index f7939fd79d..99329a3452 100755
--- a/tools/scripts/merge-forward
+++ b/tools/scripts/merge-forward
@@ -19,7 +19,10 @@ if [ -z "$RELPATH" -o  -z "$REMOTE" -o  -z "$MAINTBRANCH" -o  -z "$DEVBRANCH" ]
 fi
 
 pushd "$RELPATH" >> /dev/null
-  TMPFILE=$(mktemp)
+  ## OS X: mktemp requires "-t prefix" argument
+  ## GNU: mktemp accepts optional -t pattern" argument
+  ## The string "merge-forward-XXXXXX" works as a prefix or pattern
+  TMPFILE=$(mktemp -t merge-forward-XXXXXX)
 
   set -x
   git fetch $REMOTE