From 471cc9f88b08880c35cb7ad1812efd89759a2ef4 Mon Sep 17 00:00:00 2001 From: zertrin Date: Thu, 24 Mar 2016 20:59:42 +0100 Subject: [PATCH] minor changes to the pull request before merging --- duplicity-backup.conf.example | 8 +++----- duplicity-backup.sh | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example index 051ef82..46781e1 100644 --- a/duplicity-backup.conf.example +++ b/duplicity-backup.conf.example @@ -387,14 +387,12 @@ MAIL="mailx" # default command for Linux mail #MAIL="sendmail" #MAIL="msmtp" -# You may also specify a custom mail script. It will be called via +# You may specify a custom mail script instead. It will be called with # the following convention: - # MAIL "SUBJECT OF MESSAGE" "TO EMAIL ADDRESS" "FROM EMAIL ADDRESS" - # The email body will be available on stdin. - -#MAIL="/path/to/custom/mail_script.py +# +#MAIL="/path/to/custom/mail_script.py" # ------------------------------------------------------------------------------ diff --git a/duplicity-backup.sh b/duplicity-backup.sh index 5bd56ed..642eea3 100755 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -364,7 +364,7 @@ email_logfile() (echo """Subject: ${EMAIL_SUBJECT}""" ; cat ${LOGFILE}) | ${MAILCMD} -f ${EMAIL_FROM} ${EMAIL_TO} elif [ "$MAIL" = "nail" ]; then cat ${LOGFILE} | ${MAILCMD} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO} - else + else cat ${LOGFILE} | ${MAILCMD} """${EMAIL_SUBJECT}""" ${EMAIL_FROM} ${EMAIL_TO} fi echo -e "Email alert sent to ${EMAIL_TO} using ${MAIL}" >> ${LOGFILE}