summaryrefslogtreecommitdiff
path: root/bin/interpret-mail
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-17 15:24:40 +0100
committerErich Eckner <git@eckner.net>2019-01-17 15:24:40 +0100
commitc9f55c95cb382e22c41a310c1005e3de43379ae9 (patch)
tree38210b816af5645dad7fad10b1de6a32fe89c76b /bin/interpret-mail
parent294c66ccc56ee6200b288585833cae1d1bfc3ea8 (diff)
downloadbuilder-c9f55c95cb382e22c41a310c1005e3de43379ae9.tar.xz
style: WHERE,ON,FROM,SELECT,JOIN should be on beginning of source lines
Diffstat (limited to 'bin/interpret-mail')
-rwxr-xr-xbin/interpret-mail9
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}"