Bob Mottram 9 年前
父节点
当前提交
e78515c135
共有 1 个文件被更改,包括 86 次插入86 次删除
  1. 86
    86
      src/freedombone

+ 86
- 86
src/freedombone 查看文件

2552
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
2552
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
2553
       BACKUP_INCLUDES_DATABASES="yes"
2553
       BACKUP_INCLUDES_DATABASES="yes"
2554
       backup_database gnusocial
2554
       backup_database gnusocial
2555
-      backup_directory_to_usb /root/tempgnusocialdata gnusocialdata
2555
+      backup_directory_to_usb '/root/tempgnusocialdata' 'gnusocialdata'
2556
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2556
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2557
       backup_directory_to_usb /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial
2557
       backup_directory_to_usb /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial
2558
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2558
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2560
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
2560
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
2561
       BACKUP_INCLUDES_DATABASES="yes"
2561
       BACKUP_INCLUDES_DATABASES="yes"
2562
       backup_database hubzilla
2562
       backup_database hubzilla
2563
-      backup_directory_to_usb /root/temphubzilladata hubzilladata
2563
+      backup_directory_to_usb '/root/temphubzilladata' 'hubzilladata'
2564
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2564
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2565
       backup_directory_to_usb /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla
2565
       backup_directory_to_usb /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla
2566
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2566
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2571
       echo "  mkdir -p $USB_MOUNT/backup/owncloud2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2571
       echo "  mkdir -p $USB_MOUNT/backup/owncloud2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2572
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2572
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2573
       backup_database owncloud
2573
       backup_database owncloud
2574
-      backup_directory_to_usb /root/tempownclouddata ownclouddata
2574
+      backup_directory_to_usb '/root/tempownclouddata' 'ownclouddata'
2575
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2575
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2576
-      backup_directory_to_usb /var/lib/owncloud owncloud
2577
-      backup_directory_to_usb /etc/owncloud owncloud2
2576
+      backup_directory_to_usb '/var/lib/owncloud' 'owncloud'
2577
+      backup_directory_to_usb '/etc/owncloud' 'owncloud2'
2578
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2578
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2579
   fi
2579
   fi
2580
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
2580
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
2586
       echo "  mkdir -p $USB_MOUNT/backup/gogsssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2586
       echo "  mkdir -p $USB_MOUNT/backup/gogsssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2587
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2587
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2588
       backup_database gogs
2588
       backup_database gogs
2589
-      backup_directory_to_usb /root/tempgogsdata gogsdata
2589
+      backup_directory_to_usb '/root/tempgogsdata' 'gogsdata'
2590
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2590
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2591
-      backup_directory_to_usb /home/git/go/src/github.com/gogits/gogs/custom gogs
2591
+      backup_directory_to_usb '/home/git/go/src/github.com/gogits/gogs/custom' 'gogs'
2592
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2592
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2593
-      backup_directory_to_usb /home/git/gogs-repositories gogsrepos
2593
+      backup_directory_to_usb '/home/git/gogs-repositories' 'gogsrepos'
2594
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2594
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2595
-      backup_directory_to_usb /home/git/.ssh gogsssh
2595
+      backup_directory_to_usb '/home/git/.ssh' 'gogsssh'
2596
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2596
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2597
   fi
2597
   fi
2598
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
2598
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
2603
       echo "  mkdir -p $USB_MOUNT/backup/wiki2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2603
       echo "  mkdir -p $USB_MOUNT/backup/wiki2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2604
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2604
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2605
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2605
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2606
-      backup_directory_to_usb /var/lib/dokuwiki wiki
2607
-      backup_directory_to_usb /etc/dokuwiki wiki2
2606
+      backup_directory_to_usb '/var/lib/dokuwiki' 'wiki'
2607
+      backup_directory_to_usb '/etc/dokuwiki' 'wiki2'
2608
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2608
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2609
   fi
2609
   fi
2610
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
2610
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
2612
       echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2612
       echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2613
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2613
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2614
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2614
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2615
-      backup_directory_to_usb /var/www/$FULLBLOG_DOMAIN_NAME/htdocs blog
2615
+      backup_directory_to_usb "/var/www/$FULLBLOG_DOMAIN_NAME/htdocs" 'blog'
2616
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2616
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2617
   fi
2617
   fi
2618
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
2618
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
2620
       echo "  mkdir -p $USB_MOUNT/backup/cjdns" >> /usr/bin/$BACKUP_SCRIPT_NAME
2620
       echo "  mkdir -p $USB_MOUNT/backup/cjdns" >> /usr/bin/$BACKUP_SCRIPT_NAME
2621
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2621
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2622
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2622
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2623
-      backup_directory_to_usb /etc/cjdns cjdns
2623
+      backup_directory_to_usb '/etc/cjdns' 'cjdns'
2624
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2624
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2625
   fi
2625
   fi
2626
 
2626
 
2641
   echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2641
   echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2642
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
2642
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
2643
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2643
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2644
-  backup_directory_to_usb '/home/$MY_USERNAME/projects' projects
2644
+  backup_directory_to_usb '/home/$MY_USERNAME/projects' 'projects'
2645
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2645
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2646
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2646
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2647
 
2647
 
2651
   echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2651
   echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2652
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
2652
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
2653
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2653
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2654
-  backup_directory_to_usb '/home/$MY_USERNAME/personal' personal
2654
+  backup_directory_to_usb '/home/$MY_USERNAME/personal' 'personal'
2655
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2655
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2656
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2656
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2657
 
2657
 
2661
   echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2661
   echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2662
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2662
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2663
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2663
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2664
-  backup_directory_to_usb $PUBLIC_MAILING_LIST_DIRECTORY mailinglist
2664
+  backup_directory_to_usb "$PUBLIC_MAILING_LIST_DIRECTORY" 'mailinglist'
2665
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2665
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2666
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2666
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2667
 
2667
 
2671
   echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2671
   echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2672
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2672
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2673
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2673
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2674
-  backup_directory_to_usb $XMPP_DIRECTORY xmpp
2674
+  backup_directory_to_usb "$XMPP_DIRECTORY" "xmpp"
2675
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2675
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2676
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2676
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2677
 
2677
 
2681
   echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2681
   echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2682
   echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
2682
   echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
2683
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2683
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2684
-  backup_directory_to_usb '/home/$MY_USERNAME/.gnupg' gnupg
2684
+  backup_directory_to_usb '/home/$MY_USERNAME/.gnupg' 'gnupg'
2685
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2685
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2686
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2686
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2687
 
2687
 
2691
   echo "  if [ ! -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2691
   echo "  if [ ! -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2692
   echo "    mkdir -p $USB_MOUNT/backup/ssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2692
   echo "    mkdir -p $USB_MOUNT/backup/ssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2693
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2693
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2694
-  backup_directory_to_usb '/home/$MY_USERNAME/.ssh' ssh
2694
+  backup_directory_to_usb '/home/$MY_USERNAME/.ssh' 'ssh'
2695
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2695
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2696
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2696
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2697
 
2697
 
2701
   echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2701
   echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2702
   echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
2702
   echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
2703
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2703
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2704
-  backup_directory_to_usb /etc/nginx/sites-available web
2704
+  backup_directory_to_usb '/etc/nginx/sites-available' 'web'
2705
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2705
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2706
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2706
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2707
 
2707
 
2715
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2715
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2716
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2716
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2717
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2717
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2718
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' readme
2718
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'readme'
2719
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2719
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2720
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2720
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2721
 
2721
 
2732
   echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2732
   echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2733
   echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
2733
   echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
2734
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2734
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2735
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' mutt
2735
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'mutt'
2736
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2736
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2737
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2737
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2738
 
2738
 
2746
   echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2746
   echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2747
   echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2747
   echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2748
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2748
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2749
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' procmail
2749
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'procmail'
2750
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2750
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2751
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2751
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2752
 
2752
 
2756
   echo "  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2756
   echo "  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2757
   echo "    mkdir -p $USB_MOUNT/backup/spamassassin" >> /usr/bin/$BACKUP_SCRIPT_NAME
2757
   echo "    mkdir -p $USB_MOUNT/backup/spamassassin" >> /usr/bin/$BACKUP_SCRIPT_NAME
2758
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2758
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2759
-  backup_directory_to_usb '/home/$MY_USERNAME/.spamassassin' spamassassin
2759
+  backup_directory_to_usb '/home/$MY_USERNAME/.spamassassin' 'spamassassin'
2760
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2760
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2761
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2761
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2762
 
2762
 
2771
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2771
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2772
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2772
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2773
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2773
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2774
-  backup_directory_to_usb /root/tempbackupemail mail
2774
+  backup_directory_to_usb '/root/tempbackupemail' 'mail'
2775
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2775
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2776
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2776
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2777
 
2777
 
2781
   echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2781
   echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2782
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
2782
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
2783
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2783
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2784
-  backup_directory_to_usb /var/cache/minidlna dlna
2784
+  backup_directory_to_usb '/var/cache/minidlna' 'dlna'
2785
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2785
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2786
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2786
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2787
 
2787
 
2798
   echo "  if [ ! -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2798
   echo "  if [ ! -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2799
   echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
2799
   echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
2800
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2800
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2801
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' voip
2801
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'voip'
2802
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2802
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2803
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2803
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2804
 
2804
 
2820
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2820
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2821
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2821
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2822
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2822
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
2823
-      backup_directory_to_usb /root/tempmariadb mariadb
2823
+      backup_directory_to_usb '/root/tempmariadb' 'mariadb'
2824
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2824
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2825
   fi
2825
   fi
2826
 
2826
 
2831
   echo "    mkdir -p $USB_MOUNT/backup/tox" >> /usr/bin/$BACKUP_SCRIPT_NAME
2831
   echo "    mkdir -p $USB_MOUNT/backup/tox" >> /usr/bin/$BACKUP_SCRIPT_NAME
2832
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2832
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2833
   echo "  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd" >> /usr/bin/$BACKUP_SCRIPT_NAME
2833
   echo "  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd" >> /usr/bin/$BACKUP_SCRIPT_NAME
2834
-  backup_directory_to_usb /var/lib/tox-bootstrapd tox
2834
+  backup_directory_to_usb '/var/lib/tox-bootstrapd' 'tox'
2835
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2835
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2836
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2836
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2837
 
2837
 
2881
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2881
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2882
   echo "if [ -d $USB_MOUNT/backup/${1} ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2882
   echo "if [ -d $USB_MOUNT/backup/${1} ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2883
   echo "  echo \"Restoring ${1} database\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
2883
   echo "  echo \"Restoring ${1} database\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
2884
-  restore_directory_from_usb /root/temp${1}data ${1}data
2884
+  restore_directory_from_usb "/root/temp${1}data" "${1}data"
2885
   echo "  if [ ! -f /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2885
   echo "  if [ ! -f /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2886
   echo "    echo \"Unable to restore ${1} database\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
2886
   echo "    echo \"Unable to restore ${1} database\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
2887
   echo '    rm -rf /root/temp${1}data' >> /usr/bin/$RESTORE_SCRIPT_NAME
2887
   echo '    rm -rf /root/temp${1}data' >> /usr/bin/$RESTORE_SCRIPT_NAME
2903
   echo "  if [ ! -d /root/temp${1} ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2903
   echo "  if [ ! -d /root/temp${1} ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2904
   echo "    mkdir /root/temp${1}" >> /usr/bin/$RESTORE_SCRIPT_NAME
2904
   echo "    mkdir /root/temp${1}" >> /usr/bin/$RESTORE_SCRIPT_NAME
2905
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2905
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2906
-  restore_directory_from_usb /root/temp${1} ${1}
2906
+  restore_directory_from_usb "/root/temp${1}" "${1}"
2907
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
2907
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
2908
       RESTORE_SUBDIR="usb/backup/${1}"
2908
       RESTORE_SUBDIR="usb/backup/${1}"
2909
   fi
2909
   fi
3040
       fi
3040
       fi
3041
       echo "if [ -d $USB_MOUNT/backup/mariadb ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3041
       echo "if [ -d $USB_MOUNT/backup/mariadb ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3042
       echo '  echo "Restoring mysql settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3042
       echo '  echo "Restoring mysql settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3043
-      restore_directory_from_usb /root/tempmariadb mariadb
3043
+      restore_directory_from_usb '/root/tempmariadb' 'mariadb'
3044
       echo '  echo "Get the MariaDB password from the backup"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3044
       echo '  echo "Get the MariaDB password from the backup"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3045
       echo "  if [ ! -f /root/tempmariadb/${RESTORE_SUBDIR}tempmariadb/db ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3045
       echo "  if [ ! -f /root/tempmariadb/${RESTORE_SUBDIR}tempmariadb/db ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3046
       echo '    echo "MariaDB password file not found"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3046
       echo '    echo "MariaDB password file not found"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3085
   fi
3085
   fi
3086
   echo "if [ -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3086
   echo "if [ -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3087
   echo '  echo "Restoring Mutt settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3087
   echo '  echo "Restoring Mutt settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3088
-  restore_directory_from_usb /root/tempmutt mutt
3088
+  restore_directory_from_usb '/root/tempmutt' 'mutt'
3089
   echo -n "  if [ -f /root/tempmutt/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3089
   echo -n "  if [ -f /root/tempmutt/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3090
   echo '$MY_USERNAME/tempbackup/.muttrc ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3090
   echo '$MY_USERNAME/tempbackup/.muttrc ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3091
   echo -n "    cp -f /root/tempmutt/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3091
   echo -n "    cp -f /root/tempmutt/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3112
   fi
3112
   fi
3113
   echo "if [ -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3113
   echo "if [ -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3114
   echo '  echo "Restoring gnupg settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3114
   echo '  echo "Restoring gnupg settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3115
-  restore_directory_from_usb /root/tempgnupg gnupg
3115
+  restore_directory_from_usb '/root/tempgnupg' 'gnupg'
3116
   echo -n "  cp -r /root/tempgnupg/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3116
   echo -n "  cp -r /root/tempgnupg/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3117
   echo '$MY_USERNAME/.gnupg /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3117
   echo '$MY_USERNAME/.gnupg /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3118
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3118
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3137
   fi
3137
   fi
3138
   echo "if [ -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3138
   echo "if [ -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3139
   echo '  echo "Restoring procmail settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3139
   echo '  echo "Restoring procmail settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3140
-  restore_directory_from_usb /root/tempprocmail procmail
3140
+  restore_directory_from_usb '/root/tempprocmail' 'procmail'
3141
   echo -n "  cp -f /root/tempprocmail/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3141
   echo -n "  cp -f /root/tempprocmail/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3142
   echo '$MY_USERNAME/tempbackup/.procmailrc /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3142
   echo '$MY_USERNAME/tempbackup/.procmailrc /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3143
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3143
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3156
   fi
3156
   fi
3157
   echo "if [ -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3157
   echo "if [ -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3158
   echo '  echo "Restoring spamassassin settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3158
   echo '  echo "Restoring spamassassin settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3159
-  restore_directory_from_usb /root/tempspamassassin spamassassin
3159
+  restore_directory_from_usb '/root/tempspamassassin' 'spamassassin'
3160
   echo -n "  cp -rf /root/tempspamassassin/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3160
   echo -n "  cp -rf /root/tempspamassassin/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3161
   echo '$MY_USERNAME/.spamassassin /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3161
   echo '$MY_USERNAME/.spamassassin /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3162
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3162
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3175
   fi
3175
   fi
3176
   echo "if [ -d $USB_MOUNT/backup/readme ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3176
   echo "if [ -d $USB_MOUNT/backup/readme ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3177
   echo '  echo "Restoring README"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3177
   echo '  echo "Restoring README"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3178
-  restore_directory_from_usb /root/tempreadme readme
3178
+  restore_directory_from_usb '/root/tempreadme' 'readme'
3179
   echo -n "  cp -f /root/tempreadme/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3179
   echo -n "  cp -f /root/tempreadme/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3180
   echo '$MY_USERNAME/tempbackup/README /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3180
   echo '$MY_USERNAME/tempbackup/README /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3181
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3181
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3194
   fi
3194
   fi
3195
   echo "if [ -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3195
   echo "if [ -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3196
   echo '  echo "Restoring ssh keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3196
   echo '  echo "Restoring ssh keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3197
-  restore_directory_from_usb /root/tempssh ssh
3197
+  restore_directory_from_usb '/root/tempssh' 'ssh'
3198
   echo -n "  cp -r /root/tempssh/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3198
   echo -n "  cp -r /root/tempssh/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3199
   echo '$MY_USERNAME/.ssh /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3199
   echo '$MY_USERNAME/.ssh /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3200
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3200
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3214
   echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3214
   echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3215
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3215
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3216
   echo '  mkdir /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
3216
   echo '  mkdir /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
3217
-  restore_directory_from_usb /root/tempssl ssl
3217
+  restore_directory_from_usb '/root/tempssl' 'ssl'
3218
   echo "  cp -r /root/tempssl/${RESTORE_SUBDIR}ssl/* /etc/ssl" >> /usr/bin/$RESTORE_SCRIPT_NAME
3218
   echo "  cp -r /root/tempssl/${RESTORE_SUBDIR}ssl/* /etc/ssl" >> /usr/bin/$RESTORE_SCRIPT_NAME
3219
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3219
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3220
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3220
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3231
   fi
3231
   fi
3232
   echo "if [ -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3232
   echo "if [ -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3233
   echo '  echo "Restoring projects"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3233
   echo '  echo "Restoring projects"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3234
-  restore_directory_from_usb /root/tempprojects projects
3234
+  restore_directory_from_usb '/root/tempprojects' 'projects'
3235
   echo '  if [ -d /home/$MY_USERNAME/projects ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3235
   echo '  if [ -d /home/$MY_USERNAME/projects ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3236
   echo '    rm -rf /home/$MY_USERNAME/projects' >> /usr/bin/$RESTORE_SCRIPT_NAME
3236
   echo '    rm -rf /home/$MY_USERNAME/projects' >> /usr/bin/$RESTORE_SCRIPT_NAME
3237
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3237
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3252
   fi
3252
   fi
3253
   echo "if [ -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3253
   echo "if [ -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3254
   echo '  echo "Restoring personal settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3254
   echo '  echo "Restoring personal settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3255
-  restore_directory_from_usb /root/temppersonal personal
3255
+  restore_directory_from_usb '/root/temppersonal' 'personal'
3256
   echo '  if [ -d /home/$MY_USERNAME/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3256
   echo '  if [ -d /home/$MY_USERNAME/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3257
   echo '    rm -rf /home/$MY_USERNAME/personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
3257
   echo '    rm -rf /home/$MY_USERNAME/personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
3258
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3258
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3273
   fi
3273
   fi
3274
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3274
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3275
   echo '  echo "Restoring public mailing list"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3275
   echo '  echo "Restoring public mailing list"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3276
-  restore_directory_from_usb /root/tempmailinglist mailinglist
3276
+  restore_directory_from_usb '/root/tempmailinglist' 'mailinglist'
3277
   echo "  cp -r /root/tempmailinglist/${RESTORE_SUBDIR}spool/mlmmj/* $PUBLIC_MAILING_LIST_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
3277
   echo "  cp -r /root/tempmailinglist/${RESTORE_SUBDIR}spool/mlmmj/* $PUBLIC_MAILING_LIST_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
3278
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3278
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3279
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3279
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3290
   fi
3290
   fi
3291
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3291
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3292
   echo '  echo "Restoring XMPP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3292
   echo '  echo "Restoring XMPP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3293
-  restore_directory_from_usb /root/tempxmpp xmpp
3293
+  restore_directory_from_usb '/root/tempxmpp' 'xmpp'
3294
   echo "  cp -r /root/tempxmpp/${RESTORE_SUBDIR}lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
3294
   echo "  cp -r /root/tempxmpp/${RESTORE_SUBDIR}lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
3295
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3295
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3296
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3296
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3337
       BACKUP_INCLUDES_WEBSITES="yes"
3337
       BACKUP_INCLUDES_WEBSITES="yes"
3338
       restore_database owncloud $OWNCLOUD_DOMAIN_NAME
3338
       restore_database owncloud $OWNCLOUD_DOMAIN_NAME
3339
       echo "if [ -d $USB_MOUNT/backup/owncloud2 ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3339
       echo "if [ -d $USB_MOUNT/backup/owncloud2 ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3340
-      restore_directory_from_usb /root/tempowncloud2 owncloud2
3340
+      restore_directory_from_usb '/root/tempowncloud2' 'owncloud2'
3341
       echo "  cp -r /root/tempowncloud2/${RESTORE_SUBDIR}owncloud/* /etc/owncloud/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3341
       echo "  cp -r /root/tempowncloud2/${RESTORE_SUBDIR}owncloud/* /etc/owncloud/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3342
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3342
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3343
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3343
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3373
       echo '    exit 981' >> /usr/bin/$RESTORE_SCRIPT_NAME
3373
       echo '    exit 981' >> /usr/bin/$RESTORE_SCRIPT_NAME
3374
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3374
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3375
       echo '  echo "Restoring Gogs repos"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3375
       echo '  echo "Restoring Gogs repos"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3376
-      restore_directory_from_usb /root/tempgogsrepos gogsrepos
3376
+      restore_directory_from_usb '/root/tempgogsrepos' 'gogsrepos'
3377
       if [[ $BACKUP_TYPE != 'obnam' ]]; then
3377
       if [[ $BACKUP_TYPE != 'obnam' ]]; then
3378
           RESTORE_SUBDIR='usb/backup/gogsrepos'
3378
           RESTORE_SUBDIR='usb/backup/gogsrepos'
3379
       fi
3379
       fi
3384
       echo '    exit 67574' >> /usr/bin/$RESTORE_SCRIPT_NAME
3384
       echo '    exit 67574' >> /usr/bin/$RESTORE_SCRIPT_NAME
3385
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3385
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3386
       echo '  echo "Restoring Gogs authorized_keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3386
       echo '  echo "Restoring Gogs authorized_keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3387
-      restore_directory_from_usb /root/tempgogsssh gogsssh
3387
+      restore_directory_from_usb '/root/tempgogsssh' 'gogsssh'
3388
       echo '  if [ ! -d /home/git/.ssh ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3388
       echo '  if [ ! -d /home/git/.ssh ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3389
       echo '    mkdir /home/git/.ssh' >> /usr/bin/$RESTORE_SCRIPT_NAME
3389
       echo '    mkdir /home/git/.ssh' >> /usr/bin/$RESTORE_SCRIPT_NAME
3390
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3390
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3411
   fi
3411
   fi
3412
   echo "if [ -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3412
   echo "if [ -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3413
   echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3413
   echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3414
-  restore_directory_from_usb /root/tempwiki wiki
3414
+  restore_directory_from_usb '/root/tempwiki' 'wiki'
3415
   echo "  cp -r /root/tempwiki/${RESTORE_SUBDIR}/lib/dokuwiki/* /var/lib/dokuwiki/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3415
   echo "  cp -r /root/tempwiki/${RESTORE_SUBDIR}/lib/dokuwiki/* /var/lib/dokuwiki/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3416
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3416
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3417
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3417
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3418
   echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3418
   echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3419
   echo '    exit 868' >> /usr/bin/$RESTORE_SCRIPT_NAME
3419
   echo '    exit 868' >> /usr/bin/$RESTORE_SCRIPT_NAME
3420
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3420
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3421
-  restore_directory_from_usb /root/tempwiki2 wiki2
3421
+  restore_directory_from_usb '/root/tempwiki2' 'wiki2'
3422
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3422
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3423
       RESTORE_SUBDIR='usb/backup/wiki2'
3423
       RESTORE_SUBDIR='usb/backup/wiki2'
3424
   fi
3424
   fi
3444
   fi
3444
   fi
3445
   echo "if [ -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3445
   echo "if [ -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3446
   echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3446
   echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3447
-  restore_directory_from_usb /root/tempblog blog
3447
+  restore_directory_from_usb '/root/tempblog' 'blog'
3448
   echo "  rm -rf /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
3448
   echo "  rm -rf /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
3449
   echo "  cp -r /root/tempblog/${RESTORE_SUBDIR}/www/$FULLBLOG_DOMAIN_NAME/htdocs /var/www/$FULLBLOG_DOMAIN_NAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3449
   echo "  cp -r /root/tempblog/${RESTORE_SUBDIR}/www/$FULLBLOG_DOMAIN_NAME/htdocs /var/www/$FULLBLOG_DOMAIN_NAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3450
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3450
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3473
   fi
3473
   fi
3474
   echo "if [ -d $USB_MOUNT/backup/cjdns ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3474
   echo "if [ -d $USB_MOUNT/backup/cjdns ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3475
   echo '  echo "Restoring cjdns installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3475
   echo '  echo "Restoring cjdns installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3476
-  restore_directory_from_usb /root/tempcjdns cjdns
3476
+  restore_directory_from_usb '/root/tempcjdns' 'cjdns'
3477
   echo "  rm -rf /etc/cjdns" >> /usr/bin/$RESTORE_SCRIPT_NAME
3477
   echo "  rm -rf /etc/cjdns" >> /usr/bin/$RESTORE_SCRIPT_NAME
3478
   echo "  cp -r /root/tempcjdns/${RESTORE_SUBDIR}/cjdns /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3478
   echo "  cp -r /root/tempcjdns/${RESTORE_SUBDIR}/cjdns /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3479
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3479
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3491
   fi
3491
   fi
3492
   echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3492
   echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3493
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3493
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3494
-  restore_directory_from_usb /root/tempmail mail
3494
+  restore_directory_from_usb '/root/tempmail' 'mail'
3495
   echo '  if [ ! -d /home/$MY_USERNAME/Maildir ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3495
   echo '  if [ ! -d /home/$MY_USERNAME/Maildir ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3496
   echo '    mkdir /home/$MY_USERNAME/Maildir' >> /usr/bin/$RESTORE_SCRIPT_NAME
3496
   echo '    mkdir /home/$MY_USERNAME/Maildir' >> /usr/bin/$RESTORE_SCRIPT_NAME
3497
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3497
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3512
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3512
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3513
   echo "  if [ -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3513
   echo "  if [ -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3514
   echo '    echo "Restoring DLNA cache"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3514
   echo '    echo "Restoring DLNA cache"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3515
-  restore_directory_from_usb /root/tempdlna dlna
3515
+  restore_directory_from_usb '/root/tempdlna' 'dlna'
3516
   echo "    cp -r /root/tempdlna/${RESTORE_SUBDIR}/cache/minidlna/* /var/cache/minidlna/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3516
   echo "    cp -r /root/tempdlna/${RESTORE_SUBDIR}/cache/minidlna/* /var/cache/minidlna/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3517
   echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3517
   echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3518
   echo "      umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3518
   echo "      umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3530
   fi
3530
   fi
3531
   echo "if [ -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3531
   echo "if [ -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3532
   echo '  echo "Restoring VoIP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3532
   echo '  echo "Restoring VoIP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3533
-  restore_directory_from_usb /root/tempvoip voip
3533
+  restore_directory_from_usb '/root/tempvoip' 'voip'
3534
   echo -n "  cp -f /root/tempvoip/${RESTORE_SUBDIR}/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3534
   echo -n "  cp -f /root/tempvoip/${RESTORE_SUBDIR}/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3535
   echo -n '$MY_USERNAME/tempbackup/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3535
   echo -n '$MY_USERNAME/tempbackup/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3536
   echo "$VOIP_CONFIG_FILE /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3536
   echo "$VOIP_CONFIG_FILE /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3552
 
3552
 
3553
   echo "if [ -d $USB_MOUNT/backup/tox ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3553
   echo "if [ -d $USB_MOUNT/backup/tox ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3554
   echo '  echo "Restoring Tox node settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3554
   echo '  echo "Restoring Tox node settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3555
-  restore_directory_from_usb /var/lib/tox-bootstrapd tox
3555
+  restore_directory_from_usb '/var/lib/tox-bootstrapd' 'tox'
3556
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3556
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3557
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3557
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3558
   echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3558
   echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3813
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
3813
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
3814
       BACKUP_INCLUDES_DATABASES="yes"
3814
       BACKUP_INCLUDES_DATABASES="yes"
3815
       backup_database_to_friend gnusocial
3815
       backup_database_to_friend gnusocial
3816
-      backup_directory_to_friend /root/tempgnusocialdata gnusocialdata
3816
+      backup_directory_to_friend '/root/tempgnusocialdata' 'gnusocialdata'
3817
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3817
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3818
-      backup_directory_to_friend /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial
3818
+      backup_directory_to_friend "/var/www/$MICROBLOG_DOMAIN_NAME/htdocs" 'gnusocial'
3819
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3819
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3820
   fi
3820
   fi
3821
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
3821
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
3822
       BACKUP_INCLUDES_DATABASES="yes"
3822
       BACKUP_INCLUDES_DATABASES="yes"
3823
       backup_database_to_friend hubzilla
3823
       backup_database_to_friend hubzilla
3824
-      backup_directory_to_friend /root/temphubzilladata hubzilladata
3824
+      backup_directory_to_friend '/root/temphubzilladata' 'hubzilladata'
3825
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3825
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3826
-      backup_directory_to_friend /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla
3826
+      backup_directory_to_friend "/var/www/$HUBZILLA_DOMAIN_NAME/htdocs" 'hubzilla'
3827
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3827
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3828
   fi
3828
   fi
3829
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
3829
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
3832
       echo '  mkdir -p $SERVER_DIRECTORY/backup/owncloud2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3832
       echo '  mkdir -p $SERVER_DIRECTORY/backup/owncloud2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3833
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3833
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3834
       backup_database_to_friend owncloud
3834
       backup_database_to_friend owncloud
3835
-      backup_directory_to_friend /root/tempownclouddata ownclouddata
3835
+      backup_directory_to_friend '/root/tempownclouddata' 'ownclouddata'
3836
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3836
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3837
-      backup_directory_to_friend /var/lib/owncloud owncloud
3838
-      backup_directory_to_friend /etc/owncloud owncloud2
3837
+      backup_directory_to_friend '/var/lib/owncloud' 'owncloud'
3838
+      backup_directory_to_friend '/etc/owncloud' 'owncloud2'
3839
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3839
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3840
   fi
3840
   fi
3841
 
3841
 
3848
       echo '  mkdir -p $SERVER_DIRECTORY/backup/gogsssh' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3848
       echo '  mkdir -p $SERVER_DIRECTORY/backup/gogsssh' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3849
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3849
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3850
       backup_database_to_friend gogs
3850
       backup_database_to_friend gogs
3851
-      backup_directory_to_friend /root/tempgogsdata gogsdata
3851
+      backup_directory_to_friend '/root/tempgogsdata' 'gogsdata'
3852
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3852
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3853
-      backup_directory_to_friend /home/git/go/src/github.com/gogits/gogs/custom gogs
3853
+      backup_directory_to_friend '/home/git/go/src/github.com/gogits/gogs/custom' 'gogs'
3854
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3854
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3855
-      backup_directory_to_friend /home/git/gogs-repositories gogsrepos
3855
+      backup_directory_to_friend '/home/git/gogs-repositories' 'gogsrepos'
3856
 
3856
 
3857
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3857
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3858
-      backup_directory_to_friend /home/git/.ssh gogsssh
3858
+      backup_directory_to_friend '/home/git/.ssh' 'gogsssh'
3859
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3859
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3860
   fi
3860
   fi
3861
 
3861
 
3867
       echo '  mkdir -p $SERVER_DIRECTORY/backup/wiki2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3867
       echo '  mkdir -p $SERVER_DIRECTORY/backup/wiki2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3868
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3868
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3869
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3869
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3870
-      backup_directory_to_friend /var/lib/dokuwiki wiki
3871
-      backup_directory_to_friend /etc/dokuwiki wiki2
3870
+      backup_directory_to_friend '/var/lib/dokuwiki' 'wiki'
3871
+      backup_directory_to_friend '/etc/dokuwiki' 'wiki2'
3872
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3872
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3873
   fi
3873
   fi
3874
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
3874
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
3876
       echo '  mkdir -p $SERVER_DIRECTORY/backup/blog' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3876
       echo '  mkdir -p $SERVER_DIRECTORY/backup/blog' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3877
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3877
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3878
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3878
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3879
-      backup_directory_to_friend /var/www/$FULLBLOG_DOMAIN_NAME/htdocs blog
3879
+      backup_directory_to_friend "/var/www/$FULLBLOG_DOMAIN_NAME/htdocs" 'blog'
3880
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3880
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3881
   fi
3881
   fi
3882
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
3882
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
3884
       echo '  mkdir -p $SERVER_DIRECTORY/backup/cjdns' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3884
       echo '  mkdir -p $SERVER_DIRECTORY/backup/cjdns' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3885
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3885
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3886
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3886
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3887
-      backup_directory_to_friend /etc/cjdns cjdns
3887
+      backup_directory_to_friend '/etc/cjdns' 'cjdns'
3888
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3888
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3889
   fi
3889
   fi
3890
 
3890
 
3895
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/ssl ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3895
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/ssl ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3896
   echo '    mkdir -p $SERVER_DIRECTORY/backup/ssl' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3896
   echo '    mkdir -p $SERVER_DIRECTORY/backup/ssl' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3897
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3897
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3898
-  backup_directory_to_friend /etc/ssl ssl
3898
+  backup_directory_to_friend '/etc/ssl' 'ssl'
3899
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3899
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3900
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3900
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3901
 
3901
 
3905
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/projects ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3905
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/projects ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3906
   echo '    mkdir -p $SERVER_DIRECTORY/backup/projects' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3906
   echo '    mkdir -p $SERVER_DIRECTORY/backup/projects' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3907
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3907
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3908
-  backup_directory_to_friend '/home/$MY_USERNAME/projects' projects
3908
+  backup_directory_to_friend '/home/$MY_USERNAME/projects' 'projects'
3909
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3909
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3910
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3910
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3911
 
3911
 
3915
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/personal ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3915
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/personal ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3916
   echo '    mkdir -p $SERVER_DIRECTORY/backup/personal' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3916
   echo '    mkdir -p $SERVER_DIRECTORY/backup/personal' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3917
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3917
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3918
-  backup_directory_to_friend '/home/$MY_USERNAME/personal' personal
3918
+  backup_directory_to_friend '/home/$MY_USERNAME/personal' 'personal'
3919
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3919
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3920
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3920
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3921
 
3921
 
3925
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mailinglist ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3925
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mailinglist ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3926
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mailinglist' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3926
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mailinglist' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3927
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3927
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3928
-  backup_directory_to_friend $PUBLIC_MAILING_LIST_DIRECTORY mailinglist
3928
+  backup_directory_to_friend "$PUBLIC_MAILING_LIST_DIRECTORY" 'mailinglist'
3929
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3929
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3930
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3930
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3931
 
3931
 
3935
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/xmpp ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3935
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/xmpp ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3936
   echo '    mkdir -p $SERVER_DIRECTORY/backup/xmpp' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3936
   echo '    mkdir -p $SERVER_DIRECTORY/backup/xmpp' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3937
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3937
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3938
-  backup_directory_to_friend $XMPP_DIRECTORY xmpp
3938
+  backup_directory_to_friend "$XMPP_DIRECTORY" 'xmpp'
3939
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3939
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3940
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3940
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3941
 
3941
 
3945
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/gnupg ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3945
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/gnupg ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3946
   echo '    mkdir -p $SERVER_DIRECTORY/backup/gnupg' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3946
   echo '    mkdir -p $SERVER_DIRECTORY/backup/gnupg' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3947
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3947
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3948
-  backup_directory_to_friend '/home/$MY_USERNAME/.gnupg' gnupg
3948
+  backup_directory_to_friend '/home/$MY_USERNAME/.gnupg' 'gnupg'
3949
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3949
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3950
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3950
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3951
 
3951
 
3955
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/ssh ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3955
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/ssh ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3956
   echo '    mkdir -p $SERVER_DIRECTORY/backup/ssh' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3956
   echo '    mkdir -p $SERVER_DIRECTORY/backup/ssh' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3957
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3957
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3958
-  backup_directory_to_friend '/home/$MY_USERNAME/.ssh' ssh
3958
+  backup_directory_to_friend '/home/$MY_USERNAME/.ssh' 'ssh'
3959
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3959
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3960
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3960
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3961
 
3961
 
3965
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/web ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3965
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/web ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3966
   echo '    mkdir -p $SERVER_DIRECTORY/backup/web' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3966
   echo '    mkdir -p $SERVER_DIRECTORY/backup/web' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3967
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3967
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3968
-  backup_directory_to_friend /etc/nginx/sites-available web
3968
+  backup_directory_to_friend '/etc/nginx/sites-available' 'web'
3969
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3969
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3970
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3970
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3971
 
3971
 
3979
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3979
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3980
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3980
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3981
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3981
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3982
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' readme
3982
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'readme'
3983
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3983
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3984
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3984
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3985
 
3985
 
3996
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mutt ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3996
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mutt ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3997
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mutt' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3997
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mutt' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3998
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3998
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
3999
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' mutt
3999
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'mutt'
4000
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4000
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4001
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4001
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4002
 
4002
 
4010
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/procmail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4010
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/procmail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4011
   echo '    mkdir -p $SERVER_DIRECTORY/backup/procmail' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4011
   echo '    mkdir -p $SERVER_DIRECTORY/backup/procmail' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4012
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4012
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4013
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' procmail
4013
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'procmail'
4014
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4014
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4015
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4015
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4016
 
4016
 
4020
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/spamassassin ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4020
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/spamassassin ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4021
   echo '    mkdir -p $SERVER_DIRECTORY/backup/spamassassin' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4021
   echo '    mkdir -p $SERVER_DIRECTORY/backup/spamassassin' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4022
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4022
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4023
-  backup_directory_to_friend '/home/$MY_USERNAME/.spamassassin' spamassassin
4023
+  backup_directory_to_friend '/home/$MY_USERNAME/.spamassassin' 'spamassassin'
4024
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4024
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4025
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4025
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4026
 
4026
 
4035
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4035
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4036
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mail' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4036
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mail' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4037
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4037
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4038
-  backup_directory_to_friend /root/backupemail mail
4038
+  backup_directory_to_friend '/root/backupemail' 'mail'
4039
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4039
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4040
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4040
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4041
 
4041
 
4045
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/dlna ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4045
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/dlna ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4046
   echo '    mkdir -p $SERVER_DIRECTORY/backup/dlna' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4046
   echo '    mkdir -p $SERVER_DIRECTORY/backup/dlna' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4047
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4047
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4048
-  backup_directory_to_friend /var/cache/minidlna dlna
4048
+  backup_directory_to_friend '/var/cache/minidlna' 'dlna'
4049
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4049
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4050
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4050
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4051
 
4051
 
4062
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/voip ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4062
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/voip ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4063
   echo '    mkdir -p $SERVER_DIRECTORY/backup/voip' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4063
   echo '    mkdir -p $SERVER_DIRECTORY/backup/voip' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4064
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4064
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4065
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' voip
4065
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'voip'
4066
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4066
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4067
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4067
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4068
 
4068
 
4073
   echo '    mkdir -p $SERVER_DIRECTORY/backup/tox' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4073
   echo '    mkdir -p $SERVER_DIRECTORY/backup/tox' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4074
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4074
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4075
   echo '  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4075
   echo '  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4076
-  backup_directory_to_friend /var/lib/tox-bootstrapd tox
4076
+  backup_directory_to_friend '/var/lib/tox-bootstrapd' 'tox'
4077
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4077
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4078
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4078
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4079
 
4079
 
4096
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4096
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4097
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4097
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4098
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4098
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4099
-      backup_directory_to_friend /root/tempmariadb mariadb
4099
+      backup_directory_to_friend '/root/tempmariadb' 'mariadb'
4100
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4100
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4101
   fi
4101
   fi
4102
 
4102