From 87d5a5e173a7523ddc4895d01906d12a88ecd888 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 27 Jun 2019 16:27:26 +1000
Subject: [PATCH] tidy up email creating a bit

---
 bad_fixes      |  5 +----
 message_helper | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/bad_fixes b/bad_fixes
index 7b3e263..ad5413f 100755
--- a/bad_fixes
+++ b/bad_fixes
@@ -3,9 +3,6 @@
 subject="Fixes tag needs some work in the BRANCH tree"
 
 tools_dir=$(dirname "$0")
-"$tools_dir"/message_helper "$@" "$subject" <<EOF
-Commit
-
-EOF
+"$tools_dir"/message_helper "$@" "$subject" </dev/null
 
 exit 0
diff --git a/message_helper b/message_helper
index 3c450dd..48e2428 100755
--- a/message_helper
+++ b/message_helper
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-. "$(dirname $0)/common.sh" ""
+# shellcheck source=./common.sh
+. "$(dirname "$0")/common.sh" ""
 
-log=$LOG_FILE
+log="$LOG_FILE"
 [ -f merge.log ] && log=merge.log
 
 branch=""
@@ -17,7 +18,7 @@ kconfig=""
         shift 2
 }
 
-cc="Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>"
+cc='Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>'
 
 [ "$branch" ] || {
 	branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
@@ -25,20 +26,13 @@ cc="Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing L
 }
 
 contact=$(get_contacts "$branch")
-greeting=${contact%% *}
-greeting=${greeting#\"}
-[ "${contact%,*}" = "${contact}" ] || greeting="all"
-
 subject="${1//BRANCH/$branch}"
-filter="sed -e \"s/BRANCH/$branch/g\""
+filter="sed -e 's/BRANCH/$branch/g'"
 [ "$kconfig" ] &&
-	filter="$filter -e \"s/KCONFIG_NAME/$kconfig/g\""
+	filter="$filter -e 's/KCONFIG_NAME/$kconfig/g'"
 filter="$filter | fmt -s"
 
-$(dirname $0)/send_email "$contact" "$cc" "linux-next: $subject" <<EOF
-Hi $greeting,
-
-$(eval $filter)
-EOF
+{ printf 'Hi all,\n\n'; eval "$filter"; } |
+	"$bin_dir"/send_email "$contact" "$cc" "linux-next: $subject"
 
 exit 0
-- 
2.39.2