From ef494e86afeeef0af637ead2e111a7e3b6ec914d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 21 Sep 2015 19:47:57 +0100
Subject: [PATCH] restore using home directory

---
 src/freedombone | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 343e7924..9012cf03 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -3078,7 +3078,7 @@ function create_restore_script {
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
   fi
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/mutt/'
   fi
@@ -3105,7 +3105,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/gnupg/'
   fi
@@ -3130,7 +3130,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/procmail/'
   fi
@@ -3149,7 +3149,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/spamassassin/'
   fi
@@ -3168,7 +3168,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/readme/'
   fi
@@ -3187,7 +3187,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/ssh/'
   fi
@@ -3224,7 +3224,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/projects/'
   fi
@@ -3245,7 +3245,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/personal/'
   fi
@@ -3484,7 +3484,7 @@ function create_restore_script {
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/mail'
   fi
@@ -4410,7 +4410,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root/'
+  RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/mutt/'
   fi
@@ -4435,7 +4435,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/gnupg'
   fi
@@ -4456,7 +4456,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/procmail'
   fi
@@ -4473,7 +4473,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/spamassassin'
   fi
@@ -4490,7 +4490,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/readme'
   fi
@@ -4507,7 +4507,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/ssh'
   fi
@@ -4540,7 +4540,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/projects'
   fi
@@ -4559,7 +4559,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/personal'
   fi
@@ -4820,7 +4820,7 @@ function restore_from_friend {
   echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
-  RESTORE_SUBDIR='root'
+  RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/mail'
   fi