nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: add msmtp command

Browse Source
This commit is contained in:
Honza Hommer 2020-03-08 04:51:39 +01:00
parent 15b841da06
commit 2a8746f6b0
No known key found for this signature in database
GPG Key ID: F1A1FA427709F5EF
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
notify/mail.sh
View File

@ -6,6 +6,7 @@
#MAIL_FROM="yyyy@gmail.com" #MAIL_FROM="yyyy@gmail.com"
#MAIL_TO="yyyy@gmail.com" #MAIL_TO="yyyy@gmail.com"
#MAIL_NOVALIDATE="" #MAIL_NOVALIDATE=""
#MAIL_MSMTP_ACCOUNT=""
mail_send() { mail_send() {
_subject="$1" _subject="$1"
@ -78,7 +79,7 @@ mail_send() {
_mail_bin() { _mail_bin() {
_MAIL_BIN="" _MAIL_BIN=""
for b in "$MAIL_BIN" sendmail ssmtp mutt mail; do for b in "$MAIL_BIN" sendmail ssmtp mutt mail msmtp; do
if _exists "$b"; then if _exists "$b"; then
_MAIL_BIN="$b" _MAIL_BIN="$b"
break break
@ -86,7 +87,7 @@ _mail_bin() {
done done
if [ -z "$_MAIL_BIN" ]; then if [ -z "$_MAIL_BIN" ]; then
_err "Please install sendmail, ssmtp, mutt or mail first." _err "Please install sendmail, ssmtp, mutt, mail or msmtp first."
return 1 return 1
fi fi
@ -105,8 +106,16 @@ _mail_cmnd() {
mutt | mail) mutt | mail)
_MAIL_ARGS="-s '$_subject'" _MAIL_ARGS="-s '$_subject'"
;; ;;
*) msmtp)
if [ -n "$MAIL_FROM" ]; then
_MAIL_ARGS="-f '$MAIL_FROM'"
fi
if [ -n "$MAIL_MSMTP_ACCOUNT" ]; then
_MAIL_ARGS="$_MAIL_ARGS -a '$MAIL_MSMTP_ACCOUNT'"
fi
;; ;;
*) ;;
esac esac
echo "'$_MAIL_BIN' $_MAIL_ARGS '$MAIL_TO'" echo "'$_MAIL_BIN' $_MAIL_ARGS '$MAIL_TO'"
@ -114,7 +123,7 @@ _mail_cmnd() {
_mail_body() { _mail_body() {
case $(basename "$_MAIL_BIN") in case $(basename "$_MAIL_BIN") in
sendmail | ssmtp) sendmail | ssmtp | msmtp)
if [ -n "$MAIL_FROM" ]; then if [ -n "$MAIL_FROM" ]; then
echo "From: $MAIL_FROM" echo "From: $MAIL_FROM"
fi fi