From ab5821e1a079eb93a428b4116cef4b27d26cbc72 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 1 Oct 2020 11:10:34 +1000 Subject: [PATCH] message_helper: improve filtering --- message_helper | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/message_helper b/message_helper index 517fbe9..09985af 100755 --- a/message_helper +++ b/message_helper @@ -30,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 -- 2.39.5