Bladeren bron

More directory creations on restore

Bob Mottram 7 jaren geleden
bovenliggende
commit
940101b74c
2 gewijzigde bestanden met toevoegingen van 44 en 2 verwijderingen
  1. 22
    1
      src/freedombone-restore-local
  2. 22
    1
      src/freedombone-restore-remote

+ 22
- 1
src/freedombone-restore-local Bestand weergeven

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2017 Bob Mottram <bob@freedombone.net>
16
+# Copyright (C) 2015-2018 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by
@@ -464,6 +464,9 @@ function restore_gpg {
464 464
                 if [ -d $temp_restore_dir/home/$USERNAME/.gnupg ]; then
465 465
                     cp -r $temp_restore_dir/home/$USERNAME/.gnupg /home/$USERNAME/
466 466
                 else
467
+                    if [ ! -d /home/$USERNAME/.gnupg ]; then
468
+                        mkdir /home/$USERNAME/.gnupg
469
+                    fi
467 470
                     cp -r $temp_restore_dir/* /home/$USERNAME/.gnupg/
468 471
                 fi
469 472
                 if [ ! "$?" = "0" ]; then
@@ -543,6 +546,9 @@ function restore_spamassassin {
543 546
                     if [ -d $temp_restore_dir/home/$USERNAME ]; then
544 547
                         cp -rf $temp_restore_dir/home/$USERNAME/.spamassassin /home/$USERNAME/
545 548
                     else
549
+                    if [ ! -d /home/$USERNAME/.spamassassin ]; then
550
+                        mkdir /home/$USERNAME/.spamassassin
551
+                    fi
546 552
                         cp -rf $temp_restore_dir/* /home/$USERNAME/.spamassassin/
547 553
                     fi
548 554
                     if [ ! "$?" = "0" ]; then
@@ -611,6 +617,9 @@ function restore_user_ssh_keys {
611 617
                 if [ -d $temp_restore_dir/home/$USERNAME/.ssh ]; then
612 618
                     cp -r $temp_restore_dir/home/$USERNAME/.ssh /home/$USERNAME/
613 619
                 else
620
+                    if [ ! -d /home/$USERNAME/.ssh ]; then
621
+                        mkdir /home/$USERNAME/.ssh
622
+                    fi
614 623
                     cp -r $temp_restore_dir/* /home/$USERNAME/.ssh/
615 624
                 fi
616 625
                 if [ ! "$?" = "0" ]; then
@@ -680,6 +689,9 @@ function restore_user_monkeysphere {
680 689
                 if [ -d $temp_restore_dir/home/$USERNAME/.monkeysphere ]; then
681 690
                     cp -r $temp_restore_dir/home/$USERNAME/.monkeysphere /home/$USERNAME/
682 691
                 else
692
+                    if [ ! -d /home/$USERNAME/.monkeysphere ]; then
693
+                        mkdir /home/$USERNAME/.monkeysphere
694
+                    fi
683 695
                     cp -r $temp_restore_dir/* /home/$USERNAME/.monkeysphere
684 696
                 fi
685 697
                 if [ ! "$?" = "0" ]; then
@@ -721,6 +733,9 @@ function restore_user_fin {
721 733
                 if [ -d $temp_restore_dir/home/$USERNAME/.fin ]; then
722 734
                     cp -r $temp_restore_dir/home/$USERNAME/.fin /home/$USERNAME/
723 735
                 else
736
+                    if [ ! -d /home/$USERNAME/.fin ]; then
737
+                        mkdir /home/$USERNAME/.fin
738
+                    fi
724 739
                     cp -r $temp_restore_dir/* /home/$USERNAME/.fin/
725 740
                 fi
726 741
                 if [ ! "$?" = "0" ]; then
@@ -754,6 +769,9 @@ function restore_user_local {
754 769
                 if [ -d $temp_restore_dir/home/$USERNAME/.local ]; then
755 770
                     cp -r $temp_restore_dir/home/$USERNAME/.local /home/$USERNAME/
756 771
                 else
772
+                    if [ ! -d /home/$USERNAME/.local ]; then
773
+                        mkdir /home/$USERNAME/.local
774
+                    fi
757 775
                     cp -r $temp_restore_dir/* /home/$USERNAME/.local/
758 776
                 fi
759 777
                 if [ ! "$?" = "0" ]; then
@@ -840,6 +858,9 @@ function restore_personal_settings {
840 858
                     if [ -d $temp_restore_dir/home/$USERNAME/personal ]; then
841 859
                         mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
842 860
                     else
861
+                        if [ ! -d /home/$USERNAME/personal ]; then
862
+                            mkdir /home/$USERNAME/personal
863
+                        fi
843 864
                         cp -r $temp_restore_dir/* /home/$USERNAME/personal/
844 865
                     fi
845 866
                     if [ ! "$?" = "0" ]; then

+ 22
- 1
src/freedombone-restore-remote Bestand weergeven

@@ -13,7 +13,7 @@
13 13
 # License
14 14
 # =======
15 15
 #
16
-# Copyright (C) 2015-2017 Bob Mottram <bob@freedombone.net>
16
+# Copyright (C) 2015-2018 Bob Mottram <bob@freedombone.net>
17 17
 #
18 18
 # This program is free software: you can redistribute it and/or modify
19 19
 # it under the terms of the GNU Affero General Public License as published by
@@ -419,6 +419,9 @@ function restore_gpg {
419 419
                 if [ -d ${temp_restore_dir}/home/$USERNAME/.gnupg ]; then
420 420
                     cp -r ${temp_restore_dir}/home/$USERNAME/.gnupg /home/$USERNAME/
421 421
                 else
422
+                    if [ ! -d /home/$USERNAME/.gnupg ]; then
423
+                        mkdir /home/$USERNAME/.gnupg
424
+                    fi
422 425
                     cp -r ${temp_restore_dir}/* /home/$USERNAME/.gnupg/
423 426
                 fi
424 427
                 if [ ! "$?" = "0" ]; then
@@ -488,6 +491,9 @@ function restore_spamassassin {
488 491
                 if [ -d $temp_restore_dir/home/$USERNAME ]; then
489 492
                     cp -rf $temp_restore_dir/home/$USERNAME/.spamassassin /home/$USERNAME/
490 493
                 else
494
+                    if [ ! -d /home/$USERNAME/.spamassassin ]; then
495
+                        mkdir /home/$USERNAME/.spamassassin
496
+                    fi
491 497
                     cp -rf $temp_restore_dir/* /home/$USERNAME/.spamassassin/
492 498
                 fi
493 499
                 if [ ! "$?" = "0" ]; then
@@ -542,6 +548,9 @@ function restore_ssh_keys {
542 548
                 if [ -d $temp_restore_dir/home/$USERNAME/.ssh ]; then
543 549
                     cp -r $temp_restore_dir/home/$USERNAME/.ssh /home/$USERNAME/
544 550
                 else
551
+                    if [ ! -d /home/$USERNAME/.ssh ]; then
552
+                        mkdir /home/$USERNAME/.ssh
553
+                    fi
545 554
                     cp -r $temp_restore_dir/* /home/$USERNAME/.ssh/
546 555
                 fi
547 556
                 if [ ! "$?" = "0" ]; then
@@ -607,6 +616,9 @@ function restore_user_monkeysphere {
607 616
                 if [ -d $temp_restore_dir/home/$USERNAME/.monkeysphere ]; then
608 617
                     cp -r $temp_restore_dir/home/$USERNAME/.monkeysphere /home/$USERNAME/
609 618
                 else
619
+                    if [ ! -d /home/$USERNAME/.monkeysphere ]; then
620
+                        mkdir /home/$USERNAME/.monkeysphere
621
+                    fi
610 622
                     cp -r $temp_restore_dir/* /home/$USERNAME/.monkeysphere/
611 623
                 fi
612 624
                 if [ ! "$?" = "0" ]; then
@@ -646,6 +658,9 @@ function restore_user_fin {
646 658
                 if [ -d $temp_restore_dir/home/$USERNAME/.fin ]; then
647 659
                     cp -r $temp_restore_dir/home/$USERNAME/.fin /home/$USERNAME/
648 660
                 else
661
+                    if [ ! -d /home/$USERNAME/.fin ]; then
662
+                        mkdir /home/$USERNAME/.fin
663
+                    fi
649 664
                     cp -r $temp_restore_dir/* /home/$USERNAME/.fin/
650 665
                 fi
651 666
                 if [ ! "$?" = "0" ]; then
@@ -677,6 +692,9 @@ function restore_user_local {
677 692
                 if [ -d $temp_restore_dir/home/$USERNAME/.local ]; then
678 693
                     cp -r $temp_restore_dir/home/$USERNAME/.local /home/$USERNAME/
679 694
                 else
695
+                    if [ ! -d /home/$USERNAME/.local ]; then
696
+                        mkdir /home/$USERNAME/.local
697
+                    fi
680 698
                     cp -r $temp_restore_dir/* /home/$USERNAME/.local/
681 699
                 fi
682 700
                 if [ ! "$?" = "0" ]; then
@@ -757,6 +775,9 @@ function restore_personal_settings {
757 775
                     fi
758 776
                     mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
759 777
                 else
778
+                    if [ ! -d /home/$USERNAME/personal ]; then
779
+                        mkdir /home/$USERNAME/personal
780
+                    fi
760 781
                     cp -r $temp_restore_dir/* /home/$USERNAME/personal/
761 782
                 fi
762 783
                 if [ ! "$?" = "0" ]; then