From 6afd2ddf42472e501501c3fde512c2e7b57e3a43 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 2 Oct 2016 15:32:26 +0100
Subject: [PATCH] Move syncthing users backup to app script

---
 src/freedombone-app-syncthing | 46 +++++++++++++++++++++++++++++++++++
 src/freedombone-backup-local  | 19 ---------------
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index cbfd6e4c..2bbc697c 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -237,6 +237,29 @@ function backup_local_syncthing {
 
         echo $"Backup to syncthing complete"
     fi
+
+    for d in /home/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
+            if [ -d /home/$USERNAME/Sync ]; then
+                echo $"Backing up syncthing files for $USERNAME"
+                backup_directory_to_usb /home/$USERNAME/Sync syncthing/$USERNAME
+                # ensure that device IDs will be backed up as part of user config settings
+                if [ ! -d /home/$USERNAME/.config/syncthing ]; then
+                    mkdir -p /home/$USERNAME/.config/syncthing
+                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
+                fi
+                if [ -f /home/$USERNAME/.syncthing-server-id ]; then
+                    cp /home/$USERNAME/.syncthing-server-id /home/$USERNAME/.config/syncthing
+                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
+                fi
+                if [ -f /home/$USERNAME/.syncthingids ]; then
+                    cp /home/$USERNAME/.syncthingids /home/$USERNAME/.config/syncthing
+                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
+                fi
+            fi
+        fi
+    done
 }
 
 function restore_local_syncthing {
@@ -327,6 +350,29 @@ function backup_remote_syncthing {
         backup_directory_to_friend /var/lib/syncthing/SyncShared syncthingshared
         echo $"Backup of syncthing shared files complete"
     fi
+
+    for d in /home/*/ ; do
+        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
+            if [ -d /home/$USERNAME/Sync ]; then
+                echo $"Backing up syncthing files for $USERNAME"
+                backup_directory_to_friend /home/$USERNAME/Sync syncthing/$USERNAME
+                # ensure that device IDs will be backed up as part of user config settings
+                if [ ! -d /home/$USERNAME/.config/syncthing ]; then
+                    mkdir -p /home/$USERNAME/.config/syncthing
+                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
+                fi
+                if [ -f /home/$USERNAME/.syncthing-server-id ]; then
+                    cp /home/$USERNAME/.syncthing-server-id /home/$USERNAME/.config/syncthing
+                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
+                fi
+                if [ -f /home/$USERNAME/.syncthingids ]; then
+                    cp /home/$USERNAME/.syncthingids /home/$USERNAME/.config/syncthing
+                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
+                fi
+            fi
+        fi
+    done
 }
 
 function restore_remote_syncthing {
diff --git a/src/freedombone-backup-local b/src/freedombone-backup-local
index ded0f8fc..9de07a4b 100755
--- a/src/freedombone-backup-local
+++ b/src/freedombone-backup-local
@@ -124,25 +124,6 @@ function backup_users {
                 backup_directory_to_usb /home/$USERNAME/.fin fin/$USERNAME
             fi
 
-            # Backup syncthing
-            if [ -d /home/$USERNAME/Sync ]; then
-                echo $"Backing up syncthing files for $USERNAME"
-                backup_directory_to_usb /home/$USERNAME/Sync syncthing/$USERNAME
-                # ensure that device IDs will be backed up as part of user config settings
-                if [ ! -d /home/$USERNAME/.config/syncthing ]; then
-                    mkdir -p /home/$USERNAME/.config/syncthing
-                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
-                fi
-                if [ -f /home/$USERNAME/.syncthing-server-id ]; then
-                    cp /home/$USERNAME/.syncthing-server-id /home/$USERNAME/.config/syncthing
-                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
-                fi
-                if [ -f /home/$USERNAME/.syncthingids ]; then
-                    cp /home/$USERNAME/.syncthingids /home/$USERNAME/.config/syncthing
-                    chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
-                fi
-            fi
-
             # Backup emacs
             if [ -d /home/$USERNAME/.emacs.d ]; then
                 echo $"Backing up Emacs config for $USERNAME"