tidy up email creating a bit

[next-scripts] / message_helper

diff --git a/message_helper b/message_helper
index 0b14b26a86a0531302dca8e34fda049fa30a7565..48e2428565d98e5d7273d5194adcf6d9ebe9c2b0 100755 (executable)
--- a/message_helper
+++ b/message_helper
@@ -1,11 +1,10 @@
 #!/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
-control=$CTRL_FILE
-[ -f control ] && control=control
 
 branch=""
 [ "$1" = "-t" ] && {
@@ -13,22 +12,27 @@ branch=""
         shift 2
 }
 
+kconfig=""
+[ "$1" = "-c" ] && {
+        kconfig=$2
+        shift 2
+}
+
+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/ .*$//')
        branch=${branch%%/*}
 }
 
-contact=$(awk -F '     ' '$3=="'"$branch"'" { print $1; }' $control)
-greeting=${contact%% *}
-greeting=${greeting#\"}
-[ "${contact%,*}" = "${contact}" ] || greeting="all"
-
+contact=$(get_contacts "$branch")
 subject="${1//BRANCH/$branch}"
+filter="sed -e 's/BRANCH/$branch/g'"
+[ "$kconfig" ] &&
+       filter="$filter -e 's/KCONFIG_NAME/$kconfig/g'"
+filter="$filter | fmt -s"
 
-$(dirname $0)/send_email "$contact" "linux-next@vger.kernel.org, linux-kernel@vger.kernel.org" "linux-next: $subject" <<EOF
-Hi $greeting,
-
-$(sed "s/BRANCH/$branch/g")
-EOF
+{ printf 'Hi all,\n\n'; eval "$filter"; } |
+       "$bin_dir"/send_email "$contact" "$cc" "linux-next: $subject"
 
 exit 0