fb54765c53c15974af6247c72f6beeb9eb077e69
- Author
- zertrin <zertrin@gmail.com>
- Committer
- zertrin <zertrin@gmail.com>
- Date
Message
Merge remote-tracking branch 'origin/dev' into rework-logging
Diff
1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
2index 2e2d68c9cabeda4d9a322011802237264699fbe5..1b4a1d54ae1e75046b424156cd624f261d0cf95a 100755
3--- a/duplicity-backup.sh
4+++ b/duplicity-backup.sh
5@@ -483,6 +483,8 @@ email_logfile()
6 mailcmd_bsd_mailx;;
7 heirloom-mailx)
8 mailcmd_heirloom_mailx;;
9+ s-nail)
10+ mailcmd_nail;;
11 *)
12 mailcmd_else;;
13 esac
14@@ -542,6 +544,8 @@ get_source_file_size()
15 {
16 echo "-----------[ Source Disk Use Information ]-----------"
17
18+ # FIXME: doesn't work properly with include/exclude-filelists (issue #101)
19+
20 # Patches to support spaces in paths-
21 # Remove space as a field separator temporarily
22 OLDIFS=$IFS
23@@ -560,6 +564,9 @@ get_source_file_size()
24 ;;
25 esac
26
27+ # always exclude /proc
28+ DUEXCLIST="/proc\n"
29+
30 for exclude in "${EXCLIST[@]}"; do
31 DUEXCLIST="${DUEXCLIST}${exclude}\n"
32 done