471cc9f88b08880c35cb7ad1812efd89759a2ef4

Author
zertrin <zertrin@gmail.com>
Committer
zertrin <zertrin@gmail.com>
Date

Message

minor changes to the pull request before merging

Diff

 1diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
 2index 051ef827c7b7d6a4dad20d238593b41ad11f6791..46781e102456806d9841abc322e2db6101b08f0e 100644
 3--- a/duplicity-backup.conf.example
 4+++ b/duplicity-backup.conf.example
 5@@ -387,14 +387,12 @@ MAIL="mailx"     # default command for Linux mail
 6 #MAIL="sendmail"
 7 #MAIL="msmtp"
 8 
 9-# You may also specify a custom mail script.  It will be called via
10+# You may specify a custom mail script instead.  It will be called with
11 # the following convention:
12-
13 # MAIL "SUBJECT OF MESSAGE" "TO EMAIL ADDRESS" "FROM EMAIL ADDRESS"
14-
15 # The email body will be available on stdin.
16-
17-#MAIL="/path/to/custom/mail_script.py
18+#
19+#MAIL="/path/to/custom/mail_script.py"
20 
21 
22 # ------------------------------------------------------------------------------
23diff --git a/duplicity-backup.sh b/duplicity-backup.sh
24index 5bd56ed833271d97e9c4d6946caabcb56e585dbb..642eea31f5b57e82b6ac5a8f787a2a99c5b80dfb 100755
25--- a/duplicity-backup.sh
26+++ b/duplicity-backup.sh
27@@ -364,7 +364,7 @@ email_logfile()
28             (echo """Subject: ${EMAIL_SUBJECT}""" ; cat ${LOGFILE}) | ${MAILCMD} -f ${EMAIL_FROM} ${EMAIL_TO}
29           elif [ "$MAIL" = "nail" ]; then
30             cat ${LOGFILE} | ${MAILCMD} -s """${EMAIL_SUBJECT}""" $EMAIL_FROM ${EMAIL_TO}
31-          else 
32+          else
33             cat ${LOGFILE} | ${MAILCMD} """${EMAIL_SUBJECT}""" ${EMAIL_FROM} ${EMAIL_TO}
34           fi
35           echo -e "Email alert sent to ${EMAIL_TO} using ${MAIL}" >> ${LOGFILE}