diff options
Diffstat (limited to 'bin/interpret-mail')
| -rwxr-xr-x | bin/interpret-mail | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/interpret-mail b/bin/interpret-mail index a925118..fc77716 100755 --- a/bin/interpret-mail +++ b/bin/interpret-mail @@ -79,7 +79,8 @@ log() { base64 -w0 )" \ "${comment}" - printf ' FROM `email_actions` JOIN `gpg_keys`' + printf ' FROM `email_actions`' + printf ' JOIN `gpg_keys`' printf '%s' "${gpg_keys_filter}" printf ' AND `email_actions`.`name`=from_base64("%s");\n' "$( printf '%s' "${action}" | \ @@ -168,7 +169,8 @@ fi gpg_keys_filter=$( # shellcheck disable=SC2016 { - printf 'SELECT DISTINCT `gpg_keys`.`id` FROM `gpg_keys`' + printf 'SELECT DISTINCT `gpg_keys`.`id`' + printf ' FROM `gpg_keys`' printf ' WHERE `gpg_keys`.`fingerprint` IN (' grep '^\[GNUPG:] VALIDSIG ' "${tmp_dir}/gpg-status" | \ cut -d' ' -f3 | \ @@ -211,7 +213,8 @@ fi # shellcheck disable=SC2016 { - printf 'SELECT DISTINCT `email_actions`.`name` FROM `email_actions`' + printf 'SELECT DISTINCT `email_actions`.`name`' + printf ' FROM `email_actions`' mysql_join_email_actions_allowed_email_actions mysql_join_allowed_email_actions_gpg_keys printf '%s\n' "${gpg_keys_filter}" |