Rework on the pull request to refactor the new code

duplicity-backup.sh

@@ -357,14 +357,14 @@ get_source_file_size()
 
   case `uname` in
     FreeBSD|Darwin|DragonFly)
-     DUEXCFLAG="-I -"
+      DUEXCFLAG="-I -"
-     ;;
+      ;;
-   OpenBSD)
+    OpenBSD)
-     echo "WARNING: OpenBSD du does not support exclusion, sizes may be off" >> ${LOGFILE}
+      echo "WARNING: OpenBSD du does not support exclusion, sizes may be off" >> ${LOGFILE}
-     DUEXCFLAG=""
+      DUEXCFLAG=""
-     ;;
+      ;;
-   *)
+    *)
-    DUEXCFLAG="--exclude-from=-"
+      DUEXCFLAG="--exclude-from=-"
     ;;
   esac
 
@@ -372,23 +372,20 @@ get_source_file_size()
     DUEXCLIST="${DUEXCLIST}${exclude}\n"
   done
 
-  # if $INCLIST non zero then itterate through it for du -hs readings, else just du -hs $ROOT
+  # if INCLIST is not set or empty, add ROOT to it to be able to calculate disk usage
-  # in both cases consider the excluded directories
   if [ ! -z "$INCLIST" ]; then
-    for include in ${INCLIST[@]}
+    DUINCLIST=($ROOT)
-      do
-        echo -e "$DUEXCLIST" | \
-        du -hs ${DUEXCFLAG} ${include} | \
-        awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
-        >> ${LOGFILE}
-      done
   else
-    echo -e "$DUEXCLIST" | \
+    DUINCLIST=$INCLIST
-    du -hs ${DUEXCFLAG} $ROOT | \
-    awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
-    >> ${LOGFILE}
   fi
 
+  for include in ${DUINCLIST[@]}; do
+      echo -e "$DUEXCLIST" | \
+      du -hs ${DUEXCFLAG} ${include} | \
+      awk '{ FS="\t"; $0=$0; print $1"\t"$2 }' \
+      >> ${LOGFILE}
+  done
+  
   echo >> ${LOGFILE}
 
   # Restore IFS