Feat: simplify conditions for bin and command

This commit is contained in:
Honza Hommer 2020-03-08 04:47:55 +01:00
parent d437d6fde9
commit 15b841da06
No known key found for this signature in database
GPG Key ID: F1A1FA427709F5EF

View File

@ -76,17 +76,16 @@ mail_send() {
} }
_mail_bin() { _mail_bin() {
if [ -n "$MAIL_BIN" ]; then _MAIL_BIN=""
_MAIL_BIN="$MAIL_BIN"
elif _exists "sendmail"; then for b in "$MAIL_BIN" sendmail ssmtp mutt mail; do
_MAIL_BIN="sendmail" if _exists "$b"; then
elif _exists "ssmtp"; then _MAIL_BIN="$b"
_MAIL_BIN="ssmtp" break
elif _exists "mutt"; then fi
_MAIL_BIN="mutt" done
elif _exists "mail"; then
_MAIL_BIN="mail" if [ -z "$_MAIL_BIN" ]; then
else
_err "Please install sendmail, ssmtp, mutt or mail first." _err "Please install sendmail, ssmtp, mutt or mail first."
return 1 return 1
fi fi
@ -95,25 +94,22 @@ _mail_bin() {
} }
_mail_cmnd() { _mail_cmnd() {
_MAIL_ARGS=""
case $(basename "$_MAIL_BIN") in case $(basename "$_MAIL_BIN") in
sendmail) sendmail)
if [ -n "$MAIL_FROM" ]; then if [ -n "$MAIL_FROM" ]; then
echo "'$_MAIL_BIN' -f '$MAIL_FROM' '$MAIL_TO'" _MAIL_ARGS="-f '$MAIL_FROM'"
else
echo "'$_MAIL_BIN' '$MAIL_TO'"
fi fi
;; ;;
ssmtp)
echo "'$_MAIL_BIN' '$MAIL_TO'"
;;
mutt | mail) mutt | mail)
echo "'$_MAIL_BIN' -s '$_subject' '$MAIL_TO'" _MAIL_ARGS="-s '$_subject'"
;; ;;
*) *)
_err "Command $MAIL_BIN is not supported, use sendmail, ssmtp, mutt or mail."
return 1
;; ;;
esac esac
echo "'$_MAIL_BIN' $_MAIL_ARGS '$MAIL_TO'"
} }
_mail_body() { _mail_body() {