From 4d5ab6247da022a58289909c7fe3d19f9cbc6948 Mon Sep 17 00:00:00 2001 From: zertrin Date: Mon, 5 Sep 2016 01:15:47 +0200 Subject: [PATCH 1/2] Add case for s-nail when using mailx --- duplicity-backup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/duplicity-backup.sh b/duplicity-backup.sh index fbc3060..18bf60b 100755 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -410,6 +410,8 @@ email_logfile() mailcmd_bsd_mailx;; heirloom-mailx) mailcmd_heirloom_mailx;; + s-nail) + mailcmd_nail;; *) mailcmd_else;; esac From 0f901f4f78a148a86026b96b791a1d689849d8ab Mon Sep 17 00:00:00 2001 From: zertrin Date: Mon, 5 Sep 2016 01:40:52 +0200 Subject: [PATCH 2/2] Always exclude /proc from Source Disk Use Information --- duplicity-backup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/duplicity-backup.sh b/duplicity-backup.sh index fbc3060..1d8a09b 100755 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -469,6 +469,8 @@ get_source_file_size() { echo "-----------[ Source Disk Use Information ]-----------" >> "${LOGFILE}" + # FIXME: doesn't work properly with include/exclude-filelists (issue #101) + # Patches to support spaces in paths- # Remove space as a field separator temporarily OLDIFS=$IFS @@ -487,6 +489,9 @@ get_source_file_size() ;; esac + # always exclude /proc + DUEXCLIST="/proc\n" + for exclude in "${EXCLIST[@]}"; do DUEXCLIST="${DUEXCLIST}${exclude}\n" done