merge_msg: set and use tools_dir

[next-scripts] / message_helper

diff --git a/message_helper b/message_helper
index 78584d4dedc4fc726da9f4d80c4690aeca2c4792..4224734bc19d0d9c39a592596537e2dd7328d8a7 100755 (executable)
--- a/message_helper
+++ b/message_helper
@@ -9,7 +9,7 @@ if [ -f merge.log ]; then
 fi
 
 branch=
-if [ "$1" = '-t' ]; then
+if [ "$1" = '-b' ]; then
         branch="$2"
         shift 2
 fi
@@ -20,7 +20,8 @@ if [ "$1" = '-c' ]; then
         shift 2
 fi
 
-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>' )
 
 if [ -z "$branch" ]; then
        branch=$(grep '^Merging ' "$log" | tail -n 1 |
@@ -29,13 +30,14 @@ fi
 
 contact=$(get_contacts "$branch")
 subject=${1//BRANCH/$branch}
-filter="sed -e 's/BRANCH/$branch/g'"
-if [ "$kconfig" ]; then
-       filter="$filter -e 's/KCONFIG_NAME/$kconfig/g'"
+filter=( -e "s/BRANCH/$branch/g" )
+if [ -n "$kconfig" ]; then
+       filter+=( -e "s/KCONFIG_NAME/$kconfig/g" )
 fi
-filter="$filter | fmt -s"
 
-{ printf 'Hi all,\n\n'; eval "$filter"; } |
-       "$bin_dir"/send_email "linux-next: $subject" "$contact" "$cc"
+{
+       printf 'Hi all,\n\n'
+       sed "${filter[@]}" | fmt -s
+} | "$bin_dir"/send_email "linux-next: $subject" "$contact" "${cc[@]}"
 
 exit 0