Browse Source

Restore of syncthing users

Bob Mottram 7 years ago
parent
commit
b72da11f6c
1 changed files with 12 additions and 2 deletions
  1. 12
    2
      src/freedombone-app-syncthing

+ 12
- 2
src/freedombone-app-syncthing View File

@@ -336,7 +336,12 @@ function restore_local_syncthing {
336 336
                     if [ ! -d /home/$USERNAME/Sync ]; then
337 337
                         mkdir /home/$USERNAME/Sync
338 338
                     fi
339
-                    cp -r ${temp_restore_dir}/* /home/$USERNAME/Sync/
339
+                    if [ -d /root/Sync ]; then
340
+                        cp -r /root/Sync/* /home/$USERNAME/Sync/
341
+                        rm -rf /root/Sync
342
+                    else
343
+                        cp -r ${temp_restore_dir}/* /home/$USERNAME/Sync/
344
+                    fi
340 345
                 fi
341 346
                 if [ ! "$?" = "0" ]; then
342 347
                     rm -rf ${temp_restore_dir}
@@ -458,7 +463,12 @@ function restore_remote_syncthing {
458 463
                     if [ ! -d /home/$USERNAME/Sync ]; then
459 464
                         mkdir /home/$USERNAME/Sync
460 465
                     fi
461
-                    cp -r $temp_restore_dir/* /home/$USERNAME/Sync/
466
+                    if [ -d /root/Sync ]; then
467
+                        cp -r /root/Sync/* /home/$USERNAME/Sync/
468
+                        rm -rf /root/Sync
469
+                    else
470
+                        cp -r ${temp_restore_dir}/* /home/$USERNAME/Sync/
471
+                    fi
462 472
                 fi
463 473
                 if [ ! "$?" = "0" ]; then
464 474
                     rm -rf $temp_restore_dir