Browse Source

Make shfmt happy

(I'm open to better ways of formatting the heredoc
that embeds the Python script.)
pull/3392/head
medmunds 4 years ago
committed by Alexander Kulumbeg
parent
commit
6e61c34f0f
  1. 19
      notify/smtp.sh

19
notify/smtp.sh

@ -63,13 +63,13 @@ smtp_send() {
SMTP_SECURE="${SMTP_SECURE:-$(_readaccountconf_mutable SMTP_SECURE)}" SMTP_SECURE="${SMTP_SECURE:-$(_readaccountconf_mutable SMTP_SECURE)}"
SMTP_SECURE="${SMTP_SECURE:-none}" SMTP_SECURE="${SMTP_SECURE:-none}"
case "$SMTP_SECURE" in case "$SMTP_SECURE" in
"none") SMTP_DEFAULT_PORT="25";;
"ssl") SMTP_DEFAULT_PORT="465";;
"tls") SMTP_DEFAULT_PORT="587";;
*)
_err "Invalid SMTP_SECURE='$SMTP_SECURE'. It must be 'ssl', 'tls' or 'none'."
return 1
;;
"none") SMTP_DEFAULT_PORT="25" ;;
"ssl") SMTP_DEFAULT_PORT="465" ;;
"tls") SMTP_DEFAULT_PORT="587" ;;
*)
_err "Invalid SMTP_SECURE='$SMTP_SECURE'. It must be 'ssl', 'tls' or 'none'."
return 1
;;
esac esac
SMTP_USERNAME="${SMTP_USERNAME:-$(_readaccountconf_mutable SMTP_USERNAME)}" SMTP_USERNAME="${SMTP_USERNAME:-$(_readaccountconf_mutable SMTP_USERNAME)}"
@ -125,7 +125,8 @@ _smtp_send() {
fi fi
# language=Python # language=Python
smtp_send_output="$($SMTP_PYTHON <<EOF
smtp_send_output="$(
$SMTP_PYTHON <<EOF
# This code is meant to work with either Python 2.7.x or Python 3.4+. # This code is meant to work with either Python 2.7.x or Python 3.4+.
try: try:
try: try:
@ -189,7 +190,7 @@ finally:
if smtp is not None: if smtp is not None:
smtp.quit() smtp.quit()
EOF EOF
)"
)"
_ret=$? _ret=$?
_debug "smtp_send_output" "$smtp_send_output" _debug "smtp_send_output" "$smtp_send_output"
return "$_ret" return "$_ret"

Loading…
Cancel
Save