From 08959ac1bbbbd34c9f68f7771b11b29baf283b2b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 25 Aug 2017 17:38:13 +0100
Subject: [PATCH] Switch backup system to duplicity

---
 src/freedombone-utils-backup | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/freedombone-utils-backup b/src/freedombone-utils-backup
index ca740bfe..c48bf4f0 100755
--- a/src/freedombone-utils-backup
+++ b/src/freedombone-utils-backup
@@ -344,8 +344,8 @@ function backup_directory_to_usb {
             mkdir -p $USB_MOUNT/backup/${2}
         fi
 
-        #backup_directory_to_usb_duplicity ${1} ${2}
-        backup_directory_to_usb_obnam ${1} ${2}
+        backup_directory_to_usb_duplicity ${1} ${2}
+        #backup_directory_to_usb_obnam ${1} ${2}
 
         if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
             shred -zu ${1}/*
@@ -383,8 +383,8 @@ function restore_directory_from_usb {
     if [ ! -d ${1} ]; then
         mkdir ${1}
     fi
-    #restore_directory_from_usb_duplicity ${1} ${2}
-    restore_directory_from_usb_obnam ${1} ${2}
+    restore_directory_from_usb_duplicity ${1} ${2}
+    #restore_directory_from_usb_obnam ${1} ${2}
 }
 
 function restore_directory_from_friend_obnam {
@@ -413,8 +413,8 @@ function restore_directory_from_friend {
     if [ ! -d ${1} ]; then
         mkdir ${1}
     fi
-    #restore_directory_from_friend_duplicity ${1} ${2}
-    restore_directory_from_friend_obnam ${1} ${2}
+    restore_directory_from_friend_duplicity ${1} ${2}
+    #restore_directory_from_friend_obnam ${1} ${2}
 }
 
 function backup_database_to_usb {
@@ -514,8 +514,8 @@ function backup_directory_to_friend {
         mkdir -p $SERVER_DIRECTORY/backup/${2}
     fi
 
-    #backup_directory_to_friend_duplicity ${1} ${2}
-    backup_directory_to_friend_obnam ${1} ${2}
+    backup_directory_to_friend_duplicity ${1} ${2}
+    #backup_directory_to_friend_obnam ${1} ${2}
 
     if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
         shred -zu /root/temp${2}/*