6ccf6917e451f013bac07bdbba1d7d39f2e0b9c9

Author
Philip <philip@yewtreeapps.com>
Committer
Philip <philip@yewtreeapps.com>
Date

Message

Don't skip source disk use report when INCLIST unconfigured

Diff

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2index af888002aba24f6f45f119859f3cfba27bcfceac..a545f344cac0fd8ca97dd5f0027020fb442e5423 100755
 3--- a/duplicity-backup.sh
 4+++ b/duplicity-backup.sh
 5@@ -366,19 +366,29 @@ get_source_file_size()
 6    *)
 7     DUEXCFLAG="--exclude-from=-"
 8     ;;
 9-esac
10+  esac
11 
12   for exclude in ${EXCLIST[@]}; do
13     DUEXCLIST="${DUEXCLIST}${exclude}\n"
14   done
15 
16-  for include in ${INCLIST[@]}
17-    do
18-      echo -e '"'$DUEXCLIST'"' | \
19-      du -hs ${DUEXCFLAG} ${include} | \
20-      awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
21-      >> ${LOGFILE}
22-  done
23+  # if $INCLIST non zero then itterate through it for df readings, else just df $ROOT
24+  # in both cases consider the excluded directories
25+  if [ ! -z "$INCLIST" ]; then
26+    for include in ${INCLIST[@]}
27+      do
28+        echo -e '"'$DUEXCLIST'"' | \
29+        du -hs ${DUEXCFLAG} ${include} | \
30+        awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
31+        >> ${LOGFILE}
32+      done
33+  else
34+    echo -e '"'$DUEXCLIST'"' | \
35+    du -hs ${DUEXCFLAG} $ROOT | \
36+    awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
37+    >> ${LOGFILE}
38+  fi
39+  
40   echo >> ${LOGFILE}
41 
42   # Restore IFS