01ec946eef81c559b613498ba84d0bda06785efa

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

Message

Correct log reports of file size to disk use, plus some log file formatting cleanups

Diff

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2index 540405161486297e9d95f17214b9f96a7a9f7258..2d6495b001f098669276517c391754bd1d8fbfbf 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@@ -397,7 +397,7 @@ get_source_file_size()
15 
16 get_remote_file_size()
17 {
18-  echo "------[ Destination File Size Information ]------" >> ${LOGFILE}
19+  echo "---------[ Destination Disk Use Information ]--------" >> ${LOGFILE}
20 
21   dest_type=`echo ${DEST} | cut -c 1,2`
22   case $dest_type in
23@@ -423,7 +423,7 @@ get_remote_file_size()
24     ;;
25   esac
26 
27-  echo "Current Remote Backup File Size: ${SIZE}" >> ${LOGFILE}
28+  echo "Current Remote Backup Disk Usage: ${SIZE}" >> ${LOGFILE}
29   echo >> ${LOGFILE}
30 }
31 
32@@ -472,7 +472,7 @@ include_exclude()
33 
34 duplicity_cleanup()
35 {
36-  echo "-----------[ Duplicity Cleanup ]-----------" >> ${LOGFILE}
37+  echo "----------------[ Duplicity Cleanup ]----------------" >> ${LOGFILE}
38   if [[ "${CLEAN_UP_TYPE}" != "none" && ! -z ${CLEAN_UP_TYPE} && ! -z ${CLEAN_UP_VARIABLE} ]]; then
39     eval ${ECHO} ${DUPLICITY} ${CLEAN_UP_TYPE} ${CLEAN_UP_VARIABLE} ${STATIC_OPTIONS} --force \
40       ${ENCRYPT} \
41@@ -703,7 +703,7 @@ case "$COMMAND" in
42     read ANSWER
43     if [ "$ANSWER" != "yes" ]; then
44       echo "You said << ${ANSWER} >> so I am exiting now."
45-      echo -e "--------    END    --------\n" >> ${LOGFILE}
46+      echo -e "---------------------    END    ---------------------\n" >> ${LOGFILE}
47       exit 1
48     fi
49 
50@@ -728,7 +728,7 @@ case "$COMMAND" in
51     ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
52     $ENCRYPT \
53     ${DEST} | tee -a ${LOGFILE}
54-    echo -e "--------    END    --------\n" >> ${LOGFILE}
55+    echo -e "---------------------    END    ---------------------\n" >> ${LOGFILE}
56   ;;
57 
58   "collection-status")
59@@ -738,7 +738,7 @@ case "$COMMAND" in
60     ${DUPLICITY} ${OPTION} ${VERBOSITY} ${STATIC_OPTIONS} \
61     $ENCRYPT \
62     ${DEST} | tee -a ${LOGFILE}
63-    echo -e "--------    END    --------\n" >> ${LOGFILE}
64+    echo -e "---------------------    END    ---------------------\n" >> ${LOGFILE}
65   ;;
66 
67   "backup")
68@@ -754,7 +754,7 @@ case "$COMMAND" in
69   ;;
70 esac
71 
72-echo -e "--------    END DUPLICITY-BACKUP SCRIPT    --------\n" >> ${LOGFILE}
73+echo -e "---------    END DUPLICITY-BACKUP SCRIPT    ---------\n" >> ${LOGFILE}
74 
75 email_logfile
76