From: Evan Hunt <each@isc.org>
Date: Tue, 19 Mar 2013 02:59:13 +0000 (-0700)
Subject: [master] newline in echo isn't portable
X-Git-Tag: v9.10.0a1~448^2~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e5d8a09cc17a6514c74179f7329b0e5187be4cf;p=thirdparty%2Fbind9.git

[master] newline in echo isn't portable
---

diff --git a/util/branchsync.sh b/util/branchsync.sh
index ce6ceb8fbec..09406a9fbaa 100644
--- a/util/branchsync.sh
+++ b/util/branchsync.sh
@@ -108,13 +108,18 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
             git reset --hard
 
             # build mail message
-            MESSAGE="Attempt to cherry pick ${hash}\nto $BRANCH failed."
-            MESSAGE=$MESSAGE"\nCommit message of change was:\n"
-            MESSAGE=$MESSAGE"`git log -1 --pretty=format:%s%n%b ${hash}`"
             subject="Branch sync to $BRANCH failed"
+            cat << EOF > /tmp/branchmsg.$$
+Attempt to cherry pick ${hash}
+to $BRANCH failed.
+
+Commit message of change was:
+`git log -1 --pretty=format:%s%n%b ${hash}`
+EOF
 
             # send mail
-            echo "$MESSAGE" | mail -s "$subject" bind-changes
+            cat /tmp/branchmsg.$$ | mail -s "$subject" bind-changes
+            rm /tmp/branchmsg.$$
         fi
 
         break