9e55b84837e7082c330de77838c82c3c6a6e5910

Message

Merge branch 'dev'

Diff

This diff is truncated to protect this page.

  1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
  2index e384702e30f73e2dfaa7a69572e431c208bead36..3b69115414bbfd95d539cd7fbb7c3a58796d3606 100755
  3--- a/duplicity-backup.sh
  4+++ b/duplicity-backup.sh
  5@@ -348,7 +348,7 @@ get_lock()
  6 
  7 get_source_file_size()
  8 {
  9-  echo "---------[ Source File Size Information ]---------" >> ${LOGFILE}
 10+  echo "-----------[ Source Disk Use Information ]-----------" >> ${LOGFILE}
 11 
 12   # Patches to support spaces in paths-
 13   # Remove space as a field separator temporarily
 14@@ -357,28 +357,35 @@ get_source_file_size()
 15 
 16   case `uname` in
 17     FreeBSD|Darwin|DragonFly)
 18-     DUEXCFLAG="-I -"
 19-     ;;
 20-   OpenBSD)
 21-     echo "WARNING: OpenBSD du does not support exclusion, sizes may be off" >> ${LOGFILE}
 22-     DUEXCFLAG=""
 23-     ;;
 24-   *)
 25-    DUEXCFLAG="--exclude-from=-"
 26+      DUEXCFLAG="-I -"
 27+      ;;
 28+    OpenBSD)
 29+      echo "WARNING: OpenBSD du does not support exclusion, sizes may be off" >> ${LOGFILE}
 30+      DUEXCFLAG=""
 31+      ;;
 32+    *)
 33+      DUEXCFLAG="--exclude-from=-"
 34     ;;
 35-esac
 36+  esac
 37 
 38   for exclude in ${EXCLIST[@]}; do
 39     DUEXCLIST="${DUEXCLIST}${exclude}\n"
 40   done
 41 
 42-  for include in ${INCLIST[@]}
 43-    do
 44-      echo -e '"'$DUEXCLIST'"' | \
 45+  # if INCLIST is not set or empty, add ROOT to it to be able to calculate disk usage
 46+  if [ -z "$INCLIST" ]; then
 47+    DUINCLIST=($ROOT)
 48+  else
 49+    DUINCLIST=("${INCLIST[@]}")
 50+  fi
 51+
 52+  for include in ${DUINCLIST[@]}; do
 53+      echo -e "$DUEXCLIST" | \
 54       du -hs ${DUEXCFLAG} ${include} | \
 55       awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
 56       >> ${LOGFILE}
 57   done
 58+  
 59   echo >> ${LOGFILE}
 60 
 61   # Restore IFS
 62@@ -387,7 +394,7 @@ esac
 63 
 64 get_remote_file_size()
 65 {
 66-  echo "------[ Destination File Size Information ]------" >> ${LOGFILE}
 67+  echo "---------[ Destination Disk Use Information ]--------" >> ${LOGFILE}
 68 
 69   dest_type=`echo ${DEST} | cut -c 1,2`
 70   case $dest_type in
 71@@ -413,7 +420,7 @@ get_remote_file_size()
 72     ;;
 73   esac
 74 
 75-  echo "Current Remote Backup File Size: ${SIZE}" >> ${LOGFILE}
 76+  echo "Current Remote Backup Disk Usage: ${SIZE}" >> ${LOGFILE}
 77   echo >> ${LOGFILE}
 78 }
 79 
 80@@ -462,7 +469,7 @@ include_exclude()
 81 
 82 duplicity_cleanup()
 83 {
 84-  echo "-----------[ Duplicity Cleanup ]-----------" >> ${LOGFILE}
 85+  echo "----------------[ Duplicity Cleanup ]----------------" >> ${LOGFILE}
 86   if [[ "${CLEAN_UP_TYPE}" != "none" && ! -z ${CLEAN_UP_TYPE} && ! -z ${CLEAN_UP_VARIABLE} ]]; then
 87     eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
 88       ${ENCRYPT} \
 89@@ -703,7 +710,7 @@ case "$COMMAND" in
 90     read ANSWER
 91     if [ "$ANSWER" != "yes" ]; then
 92       echo "You said << ${ANSWER} >> so I am exiting now."
 93-      echo -e "--------    END    --------\n" >> ${LOGFILE}
 94+      echo -e "---------------------    END    ---------------------\n" >> ${LOGFILE}
 95       exit 1
 96     fi
 97 
 98@@ -728,7 +735,7 @@ case "$COMMAND" in
 99     ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
100     $ENCRYPT \
101     ${DEST} | tee -a ${LOGFILE}
102-    echo -e "--------    END    --------\n" >> ${LOGFILE}
103+    echo -e "---------------------    END    ---------------------\n" >> ${LOGFILE}
104   ;;