瀏覽代碼

More directory creations on restore

Bob Mottram 7 年之前
父節點
當前提交
940101b74c
共有 2 個文件被更改,包括 44 次插入2 次删除
  1. 22
    1
      src/freedombone-restore-local
  2. 22
    1
      src/freedombone-restore-remote

+ 22
- 1
src/freedombone-restore-local 查看文件

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

+ 22
- 1
src/freedombone-restore-remote 查看文件

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