free
/
freedombone
Suivre 1
Favoriser 0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

Better implementation of usb mount in local backup

Bob Mottram il y a 10 ans
Parent
c0b7f49a8f
révision
bb27e4a0b1
1 fichiers modifiés avec 172 ajouts et 172 suppressions
Vue séparée Afficher les stats Diff
  1. 172
    172
      src/freedombone

+ 172
- 172
src/freedombone Voir le fichier 

@@ -2418,7 +2418,6 @@ function get_mariadb_owncloud_admin_password {
2418 2418 
 function backup_directory_to_usb {
2419 2419 
   echo 'function backup_directory_to_usb {' >> /usr/bin/$BACKUP_SCRIPT_NAME
2420 2420 
   echo "  MY_NAME=\"$MY_NAME\"" >> /usr/bin/$BACKUP_SCRIPT_NAME
2421 
-  echo "  USB_MOUNT=$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2422 2421 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2423 2422 
   echo '  if [ ! -d ${1} ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2424 2423 
   echo '    echo "WARNING: directory does not exist: ${1}"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2458,8 +2457,6 @@ function backup_directory_to_usb {
2458 2457 
 function backup_database {
2459 2458 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2460 2459 
   echo 'function backup_database {' >> /usr/bin/$BACKUP_SCRIPT_NAME
2461 
-  echo "  USB_MOUNT=$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2462 
-  echo "  DATABASE_PASSWORD='$DATABASE_PASSWORD'" >> /usr/bin/$BACKUP_SCRIPT_NAME
2463 2460 
   echo '  if [ ! -d $USB_MOUNT/backup/${1} ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2464 2461 
   echo '    mkdir -p $USB_MOUNT/backup/${1}' >> /usr/bin/$BACKUP_SCRIPT_NAME
2465 2462 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2504,6 +2501,7 @@ function create_backup_script {
2504 2501 
   echo 'if [ $1 ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2505 2502 
   echo '  USB_DRIVE=/dev/${1}1' >> /usr/bin/$BACKUP_SCRIPT_NAME
2506 2503 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2504 
+  echo "USB_MOUNT=$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2507 2505 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2508 2506 
   echo "ADMIN_USERNAME=$MY_USERNAME" >> /usr/bin/$BACKUP_SCRIPT_NAME
2509 2507 
   echo "MY_USERNAME=$MY_USERNAME" >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2516,9 +2514,9 @@ function create_backup_script {
2516 2514 
   echo '  exit 1' >> /usr/bin/$BACKUP_SCRIPT_NAME
2517 2515 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2518 2516 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2519 
-  echo "umount -f $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2520 
-  echo "if [ ! -d $USB_MOUNT ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2521 
-  echo "  mkdir $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2517 
+  echo 'umount -f $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2518 
+  echo 'if [ ! -d $USB_MOUNT ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2519 
+  echo '  mkdir $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2522 2520 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2523 2521 
   echo 'if [ -f /dev/mapper/encrypted_usb ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2524 2522 
   echo '  rm -rf /dev/mapper/encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2529,21 +2527,27 @@ function create_backup_script {
2529 2527 
   echo '  USB_DRIVE=/dev/mapper/encrypted_usb' >> /usr/bin/$BACKUP_SCRIPT_NAME
2530 2528 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2531 2529 
   echo -n 'mount $USB_DRIVE ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2532 
-  echo "$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2530 
+  echo '$USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2533 2531 
   echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2534 
-  echo "  echo 'There was a problem mounting the USB drive to $USB_MOUNT'" >> /usr/bin/$BACKUP_SCRIPT_NAME
2535 
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2532 
+  echo '  echo "There was a problem mounting the USB drive to $USB_MOUNT"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2533 
+  echo '  rm -rf $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2536 2534 
   echo '  exit 6392' >> /usr/bin/$BACKUP_SCRIPT_NAME
2537 2535 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2538 
-  echo "if [ ! -d $USB_MOUNT/backup ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2539 
-  echo "  mkdir $USB_MOUNT/backup" >> /usr/bin/$BACKUP_SCRIPT_NAME
2536 
+  echo 'if [ ! -d $USB_MOUNT/backup ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2537 
+  echo '  mkdir $USB_MOUNT/backup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2540 2538 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2541 
-  echo "if [ ! -d $USB_MOUNT/backup ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2542 
-  echo "  echo 'There was a problem making the directory $USB_MOUNT/backup.'" >> /usr/bin/$BACKUP_SCRIPT_NAME
2543 
-  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2544 
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2539 
+  echo 'if [ ! -d $USB_MOUNT/backup ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2540 
+  echo '  echo "There was a problem making the directory $USB_MOUNT/backup."' >> /usr/bin/$BACKUP_SCRIPT_NAME
2541 
+  echo '  umount $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2542 
+  echo '  rm -rf $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2545 2543 
   echo '  exit 27' >> /usr/bin/$BACKUP_SCRIPT_NAME
2546 2544 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2545 
+
2546 
+  echo '# MariaDB password' >> /usr/bin/$BACKUP_SCRIPT_NAME
2547 
+  echo -n 'DATABASE_PASSWORD=$(cat ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2548 
+  echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$BACKUP_SCRIPT_NAME
2549 
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2550 
+
2547 2551 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2548 2552 
   backup_database
2549 2553 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2560,14 +2564,11 @@ function create_backup_script {
2560 2564 
       echo '  echo "GPG encrypt the backup key"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2561 2565 
       echo "  gpg -c $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
2562 2566 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2563 
-      echo "cp $BACKUP_CERTIFICATE.gpg $USB_MOUNT/backup/key.gpg" >> /usr/bin/$BACKUP_SCRIPT_NAME
2567 
+      echo -n "cp $BACKUP_CERTIFICATE.gpg " >> /usr/bin/$BACKUP_SCRIPT_NAME
2568 
+      echo '$USB_MOUNT/backup/key.gpg' >> /usr/bin/$BACKUP_SCRIPT_NAME
2564 2569 
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2565 2570 
   fi
2566 2571
2567 
-  echo '# MariaDB password' >> /usr/bin/$BACKUP_SCRIPT_NAME
2568 
-  echo -n 'DATABASE_PASSWORD=$(cat ' >> /usr/bin/$BACKUP_SCRIPT_NAME
2569 
-  echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$BACKUP_SCRIPT_NAME
2570 
-  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2571 2572 
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
2572 2573 
       BACKUP_INCLUDES_DATABASES="yes"
2573 2574 
       echo 'backup_database gnusocial' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2586,8 +2587,8 @@ function create_backup_script {
2586 2587 
   fi
2587 2588 
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
2588 2589 
       BACKUP_INCLUDES_DATABASES="yes"
2589 
-      echo "if [ ! -d $USB_MOUNT/backup/owncloud2 ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2590 
-      echo "  mkdir -p $USB_MOUNT/backup/owncloud2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2590 
+      echo 'if [ ! -d $USB_MOUNT/backup/owncloud2 ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2591 
+      echo '  mkdir -p $USB_MOUNT/backup/owncloud2' >> /usr/bin/$BACKUP_SCRIPT_NAME
2591 2592 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2592 2593 
       echo 'backup_database owncloud' >> /usr/bin/$BACKUP_SCRIPT_NAME
2593 2594 
       echo 'backup_directory_to_usb /root/tempownclouddata ownclouddata' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2598,11 +2599,11 @@ function create_backup_script {
2598 2599 
   fi
2599 2600 
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
2600 2601 
       BACKUP_INCLUDES_DATABASES="yes"
2601 
-      echo "if [ ! -d $USB_MOUNT/backup/gogsrepos ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2602 
-      echo "  mkdir -p $USB_MOUNT/backup/gogsrepos" >> /usr/bin/$BACKUP_SCRIPT_NAME
2602 
+      echo 'if [ ! -d $USB_MOUNT/backup/gogsrepos ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2603 
+      echo '  mkdir -p $USB_MOUNT/backup/gogsrepos' >> /usr/bin/$BACKUP_SCRIPT_NAME
2603 2604 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2604 
-      echo "if [ ! -d $USB_MOUNT/backup/gogsssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2605 
-      echo "  mkdir -p $USB_MOUNT/backup/gogsssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2605 
+      echo 'if [ ! -d $USB_MOUNT/backup/gogsssh ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2606 
+      echo '  mkdir -p $USB_MOUNT/backup/gogsssh' >> /usr/bin/$BACKUP_SCRIPT_NAME
2606 2607 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2607 2608 
       echo 'backup_database gogs' >> /usr/bin/$BACKUP_SCRIPT_NAME
2608 2609 
       echo 'backup_directory_to_usb /root/tempgogsdata gogsdata' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2616,11 +2617,11 @@ function create_backup_script {
2616 2617 
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2617 2618 
   fi
2618 2619 
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
2619 
-      echo "if [ ! -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2620 
-      echo "  mkdir -p $USB_MOUNT/backup/wiki" >> /usr/bin/$BACKUP_SCRIPT_NAME
2620 
+      echo 'if [ ! -d $USB_MOUNT/backup/wiki ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2621 
+      echo '  mkdir -p $USB_MOUNT/backup/wiki' >> /usr/bin/$BACKUP_SCRIPT_NAME
2621 2622 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2622 
-      echo "if [ ! -d $USB_MOUNT/backup/wiki2 ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2623 
-      echo "  mkdir -p $USB_MOUNT/backup/wiki2" >> /usr/bin/$BACKUP_SCRIPT_NAME
2623 
+      echo 'if [ ! -d $USB_MOUNT/backup/wiki2 ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2624 
+      echo '  mkdir -p $USB_MOUNT/backup/wiki2' >> /usr/bin/$BACKUP_SCRIPT_NAME
2624 2625 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2625 2626 
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2626 2627 
       echo 'backup_directory_to_usb /var/lib/dokuwiki wiki' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2628,16 +2629,16 @@ function create_backup_script {
2628 2629 
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2629 2630 
   fi
2630 2631 
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
2631 
-      echo "if [ ! -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2632 
-      echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2632 
+      echo 'if [ ! -d $USB_MOUNT/backup/blog ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2633 
+      echo '  mkdir -p $USB_MOUNT/backup/blog' >> /usr/bin/$BACKUP_SCRIPT_NAME
2633 2634 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2634 2635 
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2635 2636 
       echo "backup_directory_to_usb /var/www/$FULLBLOG_DOMAIN_NAME/htdocs blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
2636 2637 
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2637 2638 
   fi
2638 2639 
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
2639 
-      echo "if [ ! -d $USB_MOUNT/backup/cjdns ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2640 
-      echo "  mkdir -p $USB_MOUNT/backup/cjdns" >> /usr/bin/$BACKUP_SCRIPT_NAME
2640 
+      echo 'if [ ! -d $USB_MOUNT/backup/cjdns ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2641 
+      echo '  mkdir -p $USB_MOUNT/backup/cjdns' >> /usr/bin/$BACKUP_SCRIPT_NAME
2641 2642 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2642 2643 
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2643 2644 
       echo 'backup_directory_to_usb /etc/cjdns cjdns' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2648,8 +2649,8 @@ function create_backup_script {
2648 2649 
   echo '# Backup certificates' >> /usr/bin/$BACKUP_SCRIPT_NAME
2649 2650 
   echo "if [ -d /etc/ssl ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2650 2651 
   echo '  echo "Backing up certificates"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2651 
-  echo "  if [ ! -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2652 
-  echo "    mkdir -p $USB_MOUNT/backup/ssl" >> /usr/bin/$BACKUP_SCRIPT_NAME
2652 
+  echo '  if [ ! -d $USB_MOUNT/backup/ssl ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2653 
+  echo '    mkdir -p $USB_MOUNT/backup/ssl' >> /usr/bin/$BACKUP_SCRIPT_NAME
2653 2654 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2654 2655 
   echo '  backup_directory_to_usb /etc/ssl ssl' >> /usr/bin/$BACKUP_SCRIPT_NAME
2655 2656 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2658,8 +2659,8 @@ function create_backup_script {
2658 2659 
   echo '# Backup projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
2659 2660 
   echo 'if [ -d /home/$MY_USERNAME/projects ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2660 2661 
   echo '  echo "Backing up projects"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2661 
-  echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2662 
-  echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
2662 
+  echo '  if [ ! -d $USB_MOUNT/backup/projects ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2663 
+  echo '    mkdir -p $USB_MOUNT/backup/projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
2663 2664 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2664 2665 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/projects projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
2665 2666 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2668,8 +2669,8 @@ function create_backup_script {
2668 2669 
   echo '# Backup personal settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2669 2670 
   echo 'if [ -d /home/$MY_USERNAME/personal ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2670 2671 
   echo '  echo "Backing up personal settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2671 
-  echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2672 
-  echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
2672 
+  echo '  if [ ! -d $USB_MOUNT/backup/personal ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2673 
+  echo '    mkdir -p $USB_MOUNT/backup/personal' >> /usr/bin/$BACKUP_SCRIPT_NAME
2673 2674 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2674 2675 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/personal personal' >> /usr/bin/$BACKUP_SCRIPT_NAME
2675 2676 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2678,8 +2679,8 @@ function create_backup_script {
2678 2679 
   echo '# Backup the public mailing list' >> /usr/bin/$BACKUP_SCRIPT_NAME
2679 2680 
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2680 2681 
   echo '  echo "Backing up the public mailing list"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2681 
-  echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2682 
-  echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2682 
+  echo '  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2683 
+  echo '    mkdir -p $USB_MOUNT/backup/mailinglist' >> /usr/bin/$BACKUP_SCRIPT_NAME
2683 2684 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2684 2685 
   echo "  backup_directory_to_usb $PUBLIC_MAILING_LIST_DIRECTORY mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
2685 2686 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2688,8 +2689,8 @@ function create_backup_script {
2688 2689 
   echo '# Backup xmpp settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2689 2690 
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2690 2691 
   echo '  echo "Backing up the XMPP settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2691 
-  echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2692 
-  echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2692 
+  echo '  if [ ! -d $USB_MOUNT/backup/xmpp ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2693 
+  echo '    mkdir -p $USB_MOUNT/backup/xmpp' >> /usr/bin/$BACKUP_SCRIPT_NAME
2693 2694 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2694 2695 
   echo "  backup_directory_to_usb $XMPP_DIRECTORY xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
2695 2696 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2698,8 +2699,8 @@ function create_backup_script {
2698 2699 
   echo '# Backup gpg keys' >> /usr/bin/$BACKUP_SCRIPT_NAME
2699 2700 
   echo 'if [ -d /home/$MY_USERNAME/.gnupg ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2700 2701 
   echo '  echo "Backing up gpg keys"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2701 
-  echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2702 
-  echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
2702 
+  echo '  if [ ! -d $USB_MOUNT/backup/gnupg ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2703 
+  echo '    mkdir -p $USB_MOUNT/backup/gnupg' >> /usr/bin/$BACKUP_SCRIPT_NAME
2703 2704 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2704 2705 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/.gnupg gnupg' >> /usr/bin/$BACKUP_SCRIPT_NAME
2705 2706 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2708,8 +2709,8 @@ function create_backup_script {
2708 2709 
   echo '# Backup ssh keys' >> /usr/bin/$BACKUP_SCRIPT_NAME
2709 2710 
   echo 'if [ -d /home/$MY_USERNAME/.ssh ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2710 2711 
   echo '  echo "Backing up ssh keys"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2711 
-  echo "  if [ ! -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2712 
-  echo "    mkdir -p $USB_MOUNT/backup/ssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
2712 
+  echo '  if [ ! -d $USB_MOUNT/backup/ssh ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2713 
+  echo '    mkdir -p $USB_MOUNT/backup/ssh' >> /usr/bin/$BACKUP_SCRIPT_NAME
2713 2714 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2714 2715 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/.ssh ssh' >> /usr/bin/$BACKUP_SCRIPT_NAME
2715 2716 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2718,8 +2719,8 @@ function create_backup_script {
2718 2719 
   echo '# Backup web sites' >> /usr/bin/$BACKUP_SCRIPT_NAME
2719 2720 
   echo "if [ -d /etc/nginx ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2720 2721 
   echo '  echo "Backing up web settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2721 
-  echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2722 
-  echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
2722 
+  echo '  if [ ! -d $USB_MOUNT/backup/web ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2723 
+  echo '    mkdir -p $USB_MOUNT/backup/web' >> /usr/bin/$BACKUP_SCRIPT_NAME
2723 2724 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2724 2725 
   echo '  backup_directory_to_usb /etc/nginx/sites-available web' >> /usr/bin/$BACKUP_SCRIPT_NAME
2725 2726 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2728,8 +2729,8 @@ function create_backup_script {
2728 2729 
   echo '# Backup README file' >> /usr/bin/$BACKUP_SCRIPT_NAME
2729 2730 
   echo 'if [ -f /home/$MY_USERNAME/README ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2730 2731 
   echo '  echo "Backing up README"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2731 
-  echo "  if [ ! -d $USB_MOUNT/backup/readme ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2732 
-  echo "    mkdir -p $USB_MOUNT/backup/readme" >> /usr/bin/$BACKUP_SCRIPT_NAME
2732 
+  echo '  if [ ! -d $USB_MOUNT/backup/readme ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2733 
+  echo '    mkdir -p $USB_MOUNT/backup/readme' >> /usr/bin/$BACKUP_SCRIPT_NAME
2733 2734 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2734 2735 
   echo '  if [ ! -d /home/$MY_USERNAME/tempbackup ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2735 2736 
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2742,8 +2743,8 @@ function create_backup_script {
2742 2743 
   echo '# Backup IPFS' >> /usr/bin/$BACKUP_SCRIPT_NAME
2743 2744 
   echo 'if [ -d /home/$MY_USERNAME/.ipfs ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2744 2745 
   echo '  echo "Backing up IPFS"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2745 
-  echo "  if [ ! -d $USB_MOUNT/backup/ipfs ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2746 
-  echo "    mkdir -p $USB_MOUNT/backup/ipfs" >> /usr/bin/$BACKUP_SCRIPT_NAME
2746 
+  echo '  if [ ! -d $USB_MOUNT/backup/ipfs ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2747 
+  echo '    mkdir -p $USB_MOUNT/backup/ipfs' >> /usr/bin/$BACKUP_SCRIPT_NAME
2747 2748 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2748 2749 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/.ipfs ipfs' >> /usr/bin/$BACKUP_SCRIPT_NAME
2749 2750 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2759,8 +2760,8 @@ function create_backup_script {
2759 2760 
   echo '  if [ -f /etc/Muttrc ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2760 2761 
   echo '    cp /etc/Muttrc /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2761 2762 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2762 
-  echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2763 
-  echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
2763 
+  echo '  if [ ! -d $USB_MOUNT/backup/mutt ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2764 
+  echo '    mkdir -p $USB_MOUNT/backup/mutt' >> /usr/bin/$BACKUP_SCRIPT_NAME
2764 2765 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2765 2766 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/tempbackup mutt' >> /usr/bin/$BACKUP_SCRIPT_NAME
2766 2767 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2773,8 +2774,8 @@ function create_backup_script {
2773 2774 
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2774 2775 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2775 2776 
   echo '  cp /home/$MY_USERNAME/.procmailrc /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2776 
-  echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2777 
-  echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2777 
+  echo '  if [ ! -d $USB_MOUNT/backup/procmail ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2778 
+  echo '    mkdir -p $USB_MOUNT/backup/procmail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2778 2779 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2779 2780 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/tempbackup procmail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2780 2781 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2783,8 +2784,8 @@ function create_backup_script {
2783 2784 
   echo '# Backup spamassassin settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2784 2785 
   echo 'if [ -d /home/$MY_USERNAME/.spamassassin ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2785 2786 
   echo '  echo "Backing up spamassassin settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2786 
-  echo "  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2787 
-  echo "    mkdir -p $USB_MOUNT/backup/spamassassin" >> /usr/bin/$BACKUP_SCRIPT_NAME
2787 
+  echo '  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2788 
+  echo '    mkdir -p $USB_MOUNT/backup/spamassassin' >> /usr/bin/$BACKUP_SCRIPT_NAME
2788 2789 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2789 2790 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/.spamassassin spamassassin' >> /usr/bin/$BACKUP_SCRIPT_NAME
2790 2791 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2798,8 +2799,8 @@ function create_backup_script {
2798 2799 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2799 2800 
   echo '  tar -czvf /root/tempbackupemail/maildir.tar.gz /home/$MY_USERNAME/Maildir' >> /usr/bin/$BACKUP_SCRIPT_NAME
2800 2801 
   echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2801 
-  echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2802 
-  echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
2802 
+  echo '  if [ ! -d $USB_MOUNT/backup/mail ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2803 
+  echo '    mkdir -p $USB_MOUNT/backup/mail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2803 2804 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2804 2805 
   echo '  backup_directory_to_usb /root/tempbackupemail mail' >> /usr/bin/$BACKUP_SCRIPT_NAME
2805 2806 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2808,8 +2809,8 @@ function create_backup_script {
2808 2809 
   echo '# Backup DLNA cache' >> /usr/bin/$BACKUP_SCRIPT_NAME
2809 2810 
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2810 2811 
   echo '  echo "Backing up DLNA cache"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2811 
-  echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2812 
-  echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
2812 
+  echo '  if [ ! -d $USB_MOUNT/backup/dlna ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2813 
+  echo '    mkdir -p $USB_MOUNT/backup/dlna' >> /usr/bin/$BACKUP_SCRIPT_NAME
2813 2814 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2814 2815 
   echo '  backup_directory_to_usb /var/cache/minidlna dlna' >> /usr/bin/$BACKUP_SCRIPT_NAME
2815 2816 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2825,8 +2826,8 @@ function create_backup_script {
2825 2826 
   echo '/home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2826 2827 
   echo -n "  cp -f /var/lib/mumble-server/$VOIP_DATABASE " >> /usr/bin/$BACKUP_SCRIPT_NAME
2827 2828 
   echo '/home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
2828 
-  echo "  if [ ! -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2829 
-  echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
2829 
+  echo '  if [ ! -d $USB_MOUNT/backup/voip ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2830 
+  echo '    mkdir -p $USB_MOUNT/backup/voip' >> /usr/bin/$BACKUP_SCRIPT_NAME
2830 2831 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2831 2832 
   echo '  backup_directory_to_usb /home/$MY_USERNAME/tempbackup voip' >> /usr/bin/$BACKUP_SCRIPT_NAME
2832 2833 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2834,8 +2835,8 @@ function create_backup_script {
2834 2835
2835 2836 
   if [[ $BACKUP_INCLUDES_DATABASES == "yes" ]]; then
2836 2837 
       echo '# Mysql settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2837 
-      echo "if [ ! -d $USB_MOUNT/backup/mariadb ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2838 
-      echo "  mkdir -p $USB_MOUNT/backup/mariadb" >> /usr/bin/$BACKUP_SCRIPT_NAME
2838 
+      echo 'if [ ! -d $USB_MOUNT/backup/mariadb ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2839 
+      echo '  mkdir -p $USB_MOUNT/backup/mariadb' >> /usr/bin/$BACKUP_SCRIPT_NAME
2839 2840 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2840 2841 
       echo 'if [ ! -d /root/tempmariadb ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2841 2842 
       echo '    mkdir /root/tempmariadb' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2844,8 +2845,8 @@ function create_backup_script {
2844 2845 
       echo "if [ ! -s /root/tempmariadb/mysql.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2845 2846 
       echo '  echo "Unable to backup mysql settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2846 2847 
       echo '  rm -rf /root/tempmariadb' >> /usr/bin/$BACKUP_SCRIPT_NAME
2847 
-      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2848 
-      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2848 
+      echo '  umount $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2849 
+      echo '  rm -rf $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2849 2850 
       echo '  exit 653' >> /usr/bin/$BACKUP_SCRIPT_NAME
2850 2851 
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2851 2852 
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2857,8 +2858,8 @@ function create_backup_script {
2857 2858 
   echo '# Backup Tox node settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2858 2859 
   echo "if [ -d /var/lib/tox-bootstrapd ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2859 2860 
   echo '  echo "Backing up Tox node settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2860 
-  echo "  if [ ! -d $USB_MOUNT/backup/tox ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
2861 
-  echo "    mkdir -p $USB_MOUNT/backup/tox" >> /usr/bin/$BACKUP_SCRIPT_NAME
2861 
+  echo '  if [ ! -d $USB_MOUNT/backup/tox ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2862 
+  echo '    mkdir -p $USB_MOUNT/backup/tox' >> /usr/bin/$BACKUP_SCRIPT_NAME
2862 2863 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2863 2864 
   echo "  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd" >> /usr/bin/$BACKUP_SCRIPT_NAME
2864 2865 
   echo '  backup_directory_to_usb /var/lib/tox-bootstrapd tox' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2866,13 +2867,13 @@ function create_backup_script {
2866 2867 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2867 2868
2868 2869 
   echo 'sync' >> /usr/bin/$BACKUP_SCRIPT_NAME
2869 
-  echo "umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2870 
+  echo 'umount $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2870 2871 
   echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2871 2872 
   echo '  echo "Unable to unmount the drive. This means that the backup did not work"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2872 
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2873 
+  echo '  rm -rf $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2873 2874 
   echo '  exit 46994' >> /usr/bin/$BACKUP_SCRIPT_NAME
2874 2875 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2875 
-  echo "rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
2876 
+  echo 'rm -rf $USB_MOUNT' >> /usr/bin/$BACKUP_SCRIPT_NAME
2876 2877
2877 2878 
   echo 'if [[ $USB_DRIVE == /dev/mapper/encrypted_usb ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2878 2879 
   echo '  echo "Unmount encrypted USB"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2892,7 +2893,6 @@ function create_backup_script {
2892 2893
2893 2894 
 function restore_directory_from_usb {
2894 2895 
   echo 'function restore_directory_from_usb {' >> /usr/bin/$RESTORE_SCRIPT_NAME
2895 
-  echo "  USB_MOUNT=$USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
2896 2896 
   echo "  BACKUP_CERTIFICATE=$BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
2897 2897 
   echo '  if [ ! -d ${1} ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
2898 2898 
   echo '    mkdir ${1}' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -2908,7 +2908,6 @@ function restore_directory_from_usb {
2908 2908
2909 2909 
 function restore_database {
2910 2910 
   echo 'function restore_database {' >> /usr/bin/$RESTORE_SCRIPT_NAME
2911 
-  echo "  USB_MOUNT=$USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
2912 2911 
   echo "  DATABASE_PASSWORD=\"$DATABASE_PASSWORD\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
2913 2912 
   if [[ $BACKUP_TYPE == 'obnam' ]]; then
2914 2913 
       echo '  RESTORE_SUBDIR="root"' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -2983,6 +2982,7 @@ function create_restore_script {
2983 2982 
   echo 'if [ $1 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
2984 2983 
   echo '  USB_DRIVE=/dev/${1}1' >> /usr/bin/$RESTORE_SCRIPT_NAME
2985 2984 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2985 
+  echo "USB_MOUNT=$USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
2986 2986 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2987 2987 
   echo "ADMIN_USERNAME=$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
2988 2988 
   echo "MY_USERNAME=$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -2995,8 +2995,8 @@ function create_restore_script {
2995 2995 
   echo '  exit 1' >> /usr/bin/$RESTORE_SCRIPT_NAME
2996 2996 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
2997 2997 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
2998 
-  echo "if [ ! -d $USB_MOUNT ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
2999 
-  echo "  mkdir $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
2998 
+  echo 'if [ ! -d $USB_MOUNT ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
2999 
+  echo '  mkdir $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3000 3000 
   echo '  if [ -f /dev/mapper/encrypted_usb ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3001 3001 
   echo '    rm -rf /dev/mapper/encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
3002 3002 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3006,12 +3006,12 @@ function create_restore_script {
3006 3006 
   echo '      USB_DRIVE=/dev/mapper/encrypted_usb' >> /usr/bin/$RESTORE_SCRIPT_NAME
3007 3007 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3008 3008 
   echo -n '  mount $USB_DRIVE ' >> /usr/bin/$RESTORE_SCRIPT_NAME
3009 
-  echo "$USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3009 
+  echo '$USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3010 3010 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3011 
-  echo "if [ ! -d $USB_MOUNT/backup ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3011 
+  echo 'if [ ! -d $USB_MOUNT/backup ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3012 3012 
   echo '  echo "No backup directory found on the USB drive."' >> /usr/bin/$RESTORE_SCRIPT_NAME
3013 
-  echo "  umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3014 
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3013 
+  echo '  umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3014 
+  echo '  rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3015 3015 
   echo '  exit 2' >> /usr/bin/$RESTORE_SCRIPT_NAME
3016 3016 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3017 3017 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3019,8 +3019,8 @@ function create_restore_script {
3019 3019 
   echo 'echo "Checking that user exists"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3020 3020 
   echo 'if [ ! -d /home/$MY_USERNAME ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3021 3021 
   echo '  echo "Username $MY_USERNAME not found. Reinstall Freedombone with this username."' >> /usr/bin/$RESTORE_SCRIPT_NAME
3022 
-  echo "  umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3023 
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3022 
+  echo '  umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3023 
+  echo '  rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3024 3024 
   echo '  exit 295' >> /usr/bin/$RESTORE_SCRIPT_NAME
3025 3025 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3026 3026 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3035,11 +3035,11 @@ function create_restore_script {
3035 3035 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3036 3036
3037 3037 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3038 
-      echo "if [ -f $USB_MOUNT/backup/key.gpg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3038 
+      echo 'if [ -f $USB_MOUNT/backup/key.gpg ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3039 3039 
       echo "  if [ -f $BACKUP_CERTIFICATE.new ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3040 3040 
       echo "    rm $BACKUP_CERTIFICATE.new" >> /usr/bin/$RESTORE_SCRIPT_NAME
3041 3041 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3042 
-      echo "  cp $USB_MOUNT/backup/key.gpg /root/tempbackupkey.gpg" >> /usr/bin/$RESTORE_SCRIPT_NAME
3042 
+      echo '  cp $USB_MOUNT/backup/key.gpg /root/tempbackupkey.gpg' >> /usr/bin/$RESTORE_SCRIPT_NAME
3043 3043 
       echo "  gpg /root/tempbackupkey.gpg" >> /usr/bin/$RESTORE_SCRIPT_NAME
3044 3044 
       echo "  if [ -f /root/tempbackupkey ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3045 3045 
       echo '    echo "Backup key decrypted"' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3049,8 +3049,8 @@ function create_restore_script {
3049 3049 
       echo '    echo "Backup certificate installed"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3050 3050 
       echo '  else' >> /usr/bin/$RESTORE_SCRIPT_NAME
3051 3051 
       echo '    echo "Unable to decrypt the backup key"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3052 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3053 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3052 
+      echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3053 
+      echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3054 3054 
       echo '    exit 735' >> /usr/bin/$RESTORE_SCRIPT_NAME
3055 3055 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3056 3056 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3058,8 +3058,8 @@ function create_restore_script {
3058 3058
3059 3059 
       echo "if [ ! -f $BACKUP_CERTIFICATE ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3060 3060 
       echo "    echo 'No backup key was found. Copy your backup key to $BACKUP_CERTIFICATE'" >> /usr/bin/$RESTORE_SCRIPT_NAME
3061 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3062 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3061 
+      echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3062 
+      echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3063 3063 
       echo '    exit 563' >> /usr/bin/$RESTORE_SCRIPT_NAME
3064 3064 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3065 3065 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3083,7 +3083,7 @@ function create_restore_script {
3083 3083 
       if [[ $BACKUP_TYPE != 'obnam' ]]; then
3084 3084 
           RESTORE_SUBDIR='usb/backup/mariadb/'
3085 3085 
       fi
3086 
-      echo "if [ -d $USB_MOUNT/backup/mariadb ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3086 
+      echo 'if [ -d $USB_MOUNT/backup/mariadb ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3087 3087 
       echo '  echo "Restoring mysql settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3088 3088 
       echo '  restore_directory_from_usb /root/tempmariadb mariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
3089 3089 
       echo '  echo "Get the MariaDB password from the backup"' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3104,8 +3104,8 @@ function create_restore_script {
3104 3104 
       echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3105 3105 
       echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3106 3106 
       echo '      echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3107 
-      echo "      umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3108 
-      echo "      rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3107 
+      echo '      umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3108 
+      echo '      rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3109 3109 
       echo '      exit 962' >> /usr/bin/$RESTORE_SCRIPT_NAME
3110 3110 
       echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3111 3111 
       echo '    echo "Restarting database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3128,7 +3128,7 @@ function create_restore_script {
3128 3128 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3129 3129 
       RESTORE_SUBDIR='usb/backup/mutt/'
3130 3130 
   fi
3131 
-  echo "if [ -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3131 
+  echo 'if [ -d $USB_MOUNT/backup/mutt ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3132 3132 
   echo '  echo "Restoring Mutt settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3133 3133 
   echo '  restore_directory_from_usb /root/tempmutt mutt' >> /usr/bin/$RESTORE_SCRIPT_NAME
3134 3134 
   echo -n "  if [ -f /root/tempmutt/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3142,8 +3142,8 @@ function create_restore_script {
3142 3142 
   echo '$MY_USERNAME/tempbackup/Muttrc /etc/Muttrc' >> /usr/bin/$RESTORE_SCRIPT_NAME
3143 3143 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3144 3144 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3145 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3146 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3145 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3146 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3147 3147 
   echo '    rm -rf /root/tempmutt' >> /usr/bin/$RESTORE_SCRIPT_NAME
3148 3148 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3149 3149 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3155,22 +3155,22 @@ function create_restore_script {
3155 3155 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3156 3156 
       RESTORE_SUBDIR='usb/backup/gnupg/'
3157 3157 
   fi
3158 
-  echo "if [ -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3158 
+  echo 'if [ -d $USB_MOUNT/backup/gnupg ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3159 3159 
   echo '  echo "Restoring gnupg settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3160 3160 
   echo '  restore_directory_from_usb /root/tempgnupg gnupg' >> /usr/bin/$RESTORE_SCRIPT_NAME
3161 3161 
   echo -n "  cp -r /root/tempgnupg/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3162 3162 
   echo '$MY_USERNAME/.gnupg /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3163 3163 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3164 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3165 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3164 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3165 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3166 3166 
   echo '    rm -rf /root/tempgnupg' >> /usr/bin/$RESTORE_SCRIPT_NAME
3167 3167 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3168 3168 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3169 3169 
   echo '  rm -rf /root/tempgnupg' >> /usr/bin/$RESTORE_SCRIPT_NAME
3170 3170 
   echo '  cp -r /home/$MY_USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_SCRIPT_NAME
3171 3171 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3172 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3173 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3172 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3173 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3174 3174 
   echo '    exit 283' >> /usr/bin/$RESTORE_SCRIPT_NAME
3175 3175 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3176 3176 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3180,14 +3180,14 @@ function create_restore_script {
3180 3180 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3181 3181 
       RESTORE_SUBDIR='usb/backup/procmail/'
3182 3182 
   fi
3183 
-  echo "if [ -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3183 
+  echo 'if [ -d $USB_MOUNT/backup/procmail ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3184 3184 
   echo '  echo "Restoring procmail settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3185 3185 
   echo '  restore_directory_from_usb /root/tempprocmail procmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
3186 3186 
   echo -n "  cp -f /root/tempprocmail/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3187 3187 
   echo '$MY_USERNAME/tempbackup/.procmailrc /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3188 3188 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3189 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3190 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3189 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3190 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3191 3191 
   echo '    rm -rf /root/tempprocmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
3192 3192 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3193 3193 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3199,14 +3199,14 @@ function create_restore_script {
3199 3199 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3200 3200 
       RESTORE_SUBDIR='usb/backup/spamassassin/'
3201 3201 
   fi
3202 
-  echo "if [ -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3202 
+  echo 'if [ -d $USB_MOUNT/backup/spamassassin ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3203 3203 
   echo '  echo "Restoring spamassassin settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3204 3204 
   echo 'restore_directory_from_usb /root/tempspamassassin spamassassin' >> /usr/bin/$RESTORE_SCRIPT_NAME
3205 3205 
   echo -n "  cp -rf /root/tempspamassassin/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3206 3206 
   echo '$MY_USERNAME/.spamassassin /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3207 3207 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3208 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3209 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3208 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3209 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3210 3210 
   echo '    rm -rf /root/tempspamassassin' >> /usr/bin/$RESTORE_SCRIPT_NAME
3211 3211 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3212 3212 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3218,14 +3218,14 @@ function create_restore_script {
3218 3218 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3219 3219 
       RESTORE_SUBDIR='usb/backup/readme/'
3220 3220 
   fi
3221 
-  echo "if [ -d $USB_MOUNT/backup/readme ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3221 
+  echo 'if [ -d $USB_MOUNT/backup/readme ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3222 3222 
   echo '  echo "Restoring README"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3223 3223 
   echo '  restore_directory_from_usb /root/tempreadme readme' >> /usr/bin/$RESTORE_SCRIPT_NAME
3224 3224 
   echo -n "  cp -f /root/tempreadme/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3225 3225 
   echo '$MY_USERNAME/tempbackup/README /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3226 3226 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3227 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3228 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3227 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3228 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3229 3229 
   echo '    rm -rf /root/tempreadme' >> /usr/bin/$RESTORE_SCRIPT_NAME
3230 3230 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3231 3231 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3237,14 +3237,14 @@ function create_restore_script {
3237 3237 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3238 3238 
       RESTORE_SUBDIR='usb/backup/ipfs/'
3239 3239 
   fi
3240 
-  echo "if [ -d $USB_MOUNT/backup/ipfs ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3240 
+  echo 'if [ -d $USB_MOUNT/backup/ipfs ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3241 3241 
   echo '  echo "Restoring IPFS"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3242 3242 
   echo '  restore_directory_from_usb /root/tempipfs ipfs' >> /usr/bin/$RESTORE_SCRIPT_NAME
3243 3243 
   echo -n "  cp -f /root/tempipfs/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3244 3244 
   echo '$MY_USERNAME/tempbackup/ipfs/* /home/$MY_USERNAME/.ipfs' >> /usr/bin/$RESTORE_SCRIPT_NAME
3245 3245 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3246 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3247 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3246 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3247 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3248 3248 
   echo '    rm -rf /root/tempipfs' >> /usr/bin/$RESTORE_SCRIPT_NAME
3249 3249 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3250 3250 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3256,14 +3256,14 @@ function create_restore_script {
3256 3256 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3257 3257 
       RESTORE_SUBDIR='usb/backup/ssh/'
3258 3258 
   fi
3259 
-  echo "if [ -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3259 
+  echo 'if [ -d $USB_MOUNT/backup/ssh ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3260 3260 
   echo '  echo "Restoring ssh keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3261 3261 
   echo '  restore_directory_from_usb /root/tempssh ssh' >> /usr/bin/$RESTORE_SCRIPT_NAME
3262 3262 
   echo -n "  cp -r /root/tempssh/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3263 3263 
   echo '$MY_USERNAME/.ssh /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3264 3264 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3265 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3266 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3265 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3266 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3267 3267 
   echo '    rm -rf /root/tempssh' >> /usr/bin/$RESTORE_SCRIPT_NAME
3268 3268 
   echo '    exit 664' >> /usr/bin/$RESTORE_SCRIPT_NAME
3269 3269 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3275,14 +3275,14 @@ function create_restore_script {
3275 3275 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3276 3276 
       RESTORE_SUBDIR='usb/backup/ssl/'
3277 3277 
   fi
3278 
-  echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3278 
+  echo 'if [ -d $USB_MOUNT/backup/ssl ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3279 3279 
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3280 3280 
   echo '  mkdir /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
3281 3281 
   echo '  restore_directory_from_usb /root/tempssl ssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
3282 3282 
   echo "  cp -r /root/tempssl/${RESTORE_SUBDIR}ssl/* /etc/ssl" >> /usr/bin/$RESTORE_SCRIPT_NAME
3283 3283 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3284 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3285 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3284 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3285 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3286 3286 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3287 3287 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3288 3288 
   echo '  rm -rf /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3293,7 +3293,7 @@ function create_restore_script {
3293 3293 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3294 3294 
       RESTORE_SUBDIR='usb/backup/projects/'
3295 3295 
   fi
3296 
-  echo "if [ -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3296 
+  echo 'if [ -d $USB_MOUNT/backup/projects ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3297 3297 
   echo '  echo "Restoring projects"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3298 3298 
   echo '  restore_directory_from_usb /root/tempprojects projects' >> /usr/bin/$RESTORE_SCRIPT_NAME
3299 3299 
   echo '  if [ -d /home/$MY_USERNAME/projects ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3302,8 +3302,8 @@ function create_restore_script {
3302 3302 
   echo -n "  mv /root/tempprojects/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3303 3303 
   echo '$MY_USERNAME/projects /home/$MY_USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
3304 3304 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3305 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3306 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3305 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3306 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3307 3307 
   echo '    exit 166' >> /usr/bin/$RESTORE_SCRIPT_NAME
3308 3308 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3309 3309 
   echo '  rm -rf /root/tempprojects' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3314,7 +3314,7 @@ function create_restore_script {
3314 3314 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3315 3315 
       RESTORE_SUBDIR='usb/backup/personal/'
3316 3316 
   fi
3317 
-  echo "if [ -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3317 
+  echo 'if [ -d $USB_MOUNT/backup/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3318 3318 
   echo '  echo "Restoring personal settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3319 3319 
   echo '  restore_directory_from_usb /root/temppersonal personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
3320 3320 
   echo '  if [ -d /home/$MY_USERNAME/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3323,8 +3323,8 @@ function create_restore_script {
3323 3323 
   echo -n "  mv /root/temppersonal/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
3324 3324 
   echo '$MY_USERNAME/personal /home/$MY_USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
3325 3325 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3326 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3327 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3326 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3327 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3328 3328 
   echo '    exit 184' >> /usr/bin/$RESTORE_SCRIPT_NAME
3329 3329 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3330 3330 
   echo '  rm -rf /root/temppersonal' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3340,8 +3340,8 @@ function create_restore_script {
3340 3340 
   echo '  restore_directory_from_usb /root/tempmailinglist mailinglist' >> /usr/bin/$RESTORE_SCRIPT_NAME
3341 3341 
   echo "  cp -r /root/tempmailinglist/${RESTORE_SUBDIR}spool/mlmmj/* $PUBLIC_MAILING_LIST_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
3342 3342 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3343 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3344 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3343 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3344 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3345 3345 
   echo '    exit 526' >> /usr/bin/$RESTORE_SCRIPT_NAME
3346 3346 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3347 3347 
   echo '  rm -rf /root/tempmailinglist' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3357,8 +3357,8 @@ function create_restore_script {
3357 3357 
   echo '  restore_directory_from_usb /root/tempxmpp xmpp' >> /usr/bin/$RESTORE_SCRIPT_NAME
3358 3358 
   echo "  cp -r /root/tempxmpp/${RESTORE_SUBDIR}lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
3359 3359 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3360 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3361 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3360 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3361 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3362 3362 
   echo '    exit 725' >> /usr/bin/$RESTORE_SCRIPT_NAME
3363 3363 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3364 3364 
   echo '  rm -rf /root/tempxmpp' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3380,7 +3380,7 @@ function create_restore_script {
3380 3380 
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
3381 3381 
       BACKUP_INCLUDES_WEBSITES="yes"
3382 3382 
       echo "restore_database hubzilla $HUBZILLA_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
3383 
-      echo "if [ -d $USB_MOUNT/backup/hubzilla ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3383 
+      echo 'if [ -d $USB_MOUNT/backup/hubzilla ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3384 3384 
       echo "  if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/store/[data]/smarty3 ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3385 3385 
       echo "    mkdir -p /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/store/[data]/smarty3" >> /usr/bin/$RESTORE_SCRIPT_NAME
3386 3386 
       echo "  fi" >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3396,7 +3396,7 @@ function create_restore_script {
3396 3396 
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
3397 3397 
       BACKUP_INCLUDES_WEBSITES="yes"
3398 3398 
       echo "restore_database owncloud $OWNCLOUD_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
3399 
-      echo "if [ -d $USB_MOUNT/backup/owncloud2 ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3399 
+      echo 'if [ -d $USB_MOUNT/backup/owncloud2 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3400 3400 
       echo 'restore_directory_from_usb /root/tempowncloud2 owncloud2' >> /usr/bin/$RESTORE_SCRIPT_NAME
3401 3401 
       RESTORE_SUBDIR='etc/'
3402 3402 
       if [[ $BACKUP_TYPE != 'obnam' ]]; then
 
@@ -3404,8 +3404,8 @@ function create_restore_script {
3404 3404 
       fi
3405 3405 
       echo "  cp -r /root/tempowncloud2/${RESTORE_SUBDIR}owncloud/* /etc/owncloud/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3406 3406 
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3407 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3408 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3407 
+      echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3408 
+      echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3409 3409 
       echo '    exit 982' >> /usr/bin/$RESTORE_SCRIPT_NAME
3410 3410 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3411 3411 
       echo '  rm -rf /root/tempowncloud' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3426,15 +3426,15 @@ function create_restore_script {
3426 3426 
       if [[ $BACKUP_TYPE != 'obnam' ]]; then
3427 3427 
           RESTORE_SUBDIR='usb/backup/gogs'
3428 3428 
       fi
3429 
-      echo "if [ -d $USB_MOUNT/backup/gogs ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3429 
+      echo 'if [ -d $USB_MOUNT/backup/gogs ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3430 3430 
       echo '  echo "Restoring Gogs settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3431 3431 
       echo '  if [ ! -d /home/git/go/src/github.com/gogits/gogs/custom ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3432 3432 
       echo '    mkdir -p /home/git/go/src/github.com/gogits/gogs/custom' >> /usr/bin/$RESTORE_SCRIPT_NAME
3433 3433 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3434 3434 
       echo "  cp -r /root/tempgogs/${RESTORE_SUBDIR}/git/go/src/github.com/gogits/gogs/custom/* /home/git/go/src/github.com/gogits/gogs/custom" >> /usr/bin/$RESTORE_SCRIPT_NAME
3435 3435 
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3436 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3437 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3436 
+      echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3437 
+      echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3438 3438 
       echo '    exit 981' >> /usr/bin/$RESTORE_SCRIPT_NAME
3439 3439 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3440 3440 
       echo '  echo "Restoring Gogs repos"' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3444,8 +3444,8 @@ function create_restore_script {
3444 3444 
       fi
3445 3445 
       echo "  cp -r /root/tempgogsrepos/${RESTORE_SUBDIR}/git/gogs-repositories/* /home/git/gogs-repositories/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3446 3446 
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3447 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3448 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3447 
+      echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3448 
+      echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3449 3449 
       echo '    exit 67574' >> /usr/bin/$RESTORE_SCRIPT_NAME
3450 3450 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3451 3451 
       echo '  echo "Restoring Gogs authorized_keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3458,8 +3458,8 @@ function create_restore_script {
3458 3458 
       fi
3459 3459 
       echo "  cp -r /root/tempgogsssh/${RESTORE_SUBDIR}/git/.ssh/* /home/git/.ssh/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3460 3460 
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3461 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3462 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3461 
+      echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3462 
+      echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3463 3463 
       echo '    exit 8463' >> /usr/bin/$RESTORE_SCRIPT_NAME
3464 3464 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3465 3465 
       echo '  rm -rf /root/tempgogs' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3474,13 +3474,13 @@ function create_restore_script {
3474 3474 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3475 3475 
       RESTORE_SUBDIR='usb/backup/wiki'
3476 3476 
   fi
3477 
-  echo "if [ -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3477 
+  echo 'if [ -d $USB_MOUNT/backup/wiki ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3478 3478 
   echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3479 3479 
   echo '  restore_directory_from_usb /root/tempwiki wiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
3480 3480 
   echo "  cp -r /root/tempwiki/${RESTORE_SUBDIR}/lib/dokuwiki/* /var/lib/dokuwiki/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3481 3481 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3482 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3483 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3482 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3483 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3484 3484 
   echo '    exit 868' >> /usr/bin/$RESTORE_SCRIPT_NAME
3485 3485 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3486 3486 
   echo '  restore_directory_from_usb /root/tempwiki2 wiki2' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3490,8 +3490,8 @@ function create_restore_script {
3490 3490 
   fi
3491 3491 
   echo "  cp -r /root/tempwiki2/${RESTORE_SUBDIR}/dokuwiki/* /etc/dokuwiki/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3492 3492 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3493 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3494 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3493 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3494 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3495 3495 
   echo '    exit 869' >> /usr/bin/$RESTORE_SCRIPT_NAME
3496 3496 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3497 3497 
   echo '  rm -rf /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3508,21 +3508,21 @@ function create_restore_script {
3508 3508 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3509 3509 
       RESTORE_SUBDIR='usb/backup/blog'
3510 3510 
   fi
3511 
-  echo "if [ -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3511 
+  echo 'if [ -d $USB_MOUNT/backup/blog ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3512 3512 
   echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3513 3513 
   echo '  restore_directory_from_usb /root/tempblog blog' >> /usr/bin/$RESTORE_SCRIPT_NAME
3514 3514 
   echo "  rm -rf /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
3515 3515 
   echo "  cp -r /root/tempblog/${RESTORE_SUBDIR}/www/$FULLBLOG_DOMAIN_NAME/htdocs /var/www/$FULLBLOG_DOMAIN_NAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3516 3516 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3517 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3518 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3517 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3518 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3519 3519 
   echo '    exit 593' >> /usr/bin/$RESTORE_SCRIPT_NAME
3520 3520 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3521 3521 
   echo '  rm -rf /root/tempblog' >> /usr/bin/$RESTORE_SCRIPT_NAME
3522 3522 
   echo "  if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/content ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3523 3523 
   echo '    echo "No content directory found after restoring blog"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3524 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3525 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3524 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3525 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3526 3526 
   echo '    exit 287' >> /usr/bin/$RESTORE_SCRIPT_NAME
3527 3527 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3528 3528 
   echo "  chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3537,14 +3537,14 @@ function create_restore_script {
3537 3537 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3538 3538 
       RESTORE_SUBDIR='usb/backup/cjdns'
3539 3539 
   fi
3540 
-  echo "if [ -d $USB_MOUNT/backup/cjdns ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3540 
+  echo 'if [ -d $USB_MOUNT/backup/cjdns ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3541 3541 
   echo '  echo "Restoring cjdns installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3542 3542 
   echo '  restore_directory_from_usb /root/tempcjdns cjdns' >> /usr/bin/$RESTORE_SCRIPT_NAME
3543 3543 
   echo "  rm -rf /etc/cjdns" >> /usr/bin/$RESTORE_SCRIPT_NAME
3544 3544 
   echo "  cp -r /root/tempcjdns/${RESTORE_SUBDIR}/cjdns /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3545 3545 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3546 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3547 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3546 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3547 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3548 3548 
   echo '    exit 8472' >> /usr/bin/$RESTORE_SCRIPT_NAME
3549 3549 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3550 3550 
   echo '  rm -rf /root/tempcjdns' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3555,7 +3555,7 @@ function create_restore_script {
3555 3555 
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
3556 3556 
       RESTORE_SUBDIR='usb/backup/mail'
3557 3557 
   fi
3558 
-  echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3558 
+  echo 'if [ -d $USB_MOUNT/backup/mail ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3559 3559 
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3560 3560 
   echo '  restore_directory_from_usb /root/tempmail mail' >> /usr/bin/$RESTORE_SCRIPT_NAME
3561 3561 
   echo '  if [ ! -d /home/$MY_USERNAME/Maildir ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3563,8 +3563,8 @@ function create_restore_script {
3563 3563 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3564 3564 
   echo "  tar -xzvf /root/tempmail/${RESTORE_SUBDIR}/tempbackupemail/maildir.tar.gz -C /" >> /usr/bin/$RESTORE_SCRIPT_NAME
3565 3565 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3566 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3567 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3566 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3567 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3568 3568 
   echo '    exit 927' >> /usr/bin/$RESTORE_SCRIPT_NAME
3569 3569 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3570 3570 
   echo '  rm -rf /root/tempmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3576,13 +3576,13 @@ function create_restore_script {
3576 3576 
       RESTORE_SUBDIR='usb/backup/dlna'
3577 3577 
   fi
3578 3578 
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3579 
-  echo "  if [ -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3579 
+  echo '  if [ -d $USB_MOUNT/backup/dlna ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3580 3580 
   echo '    echo "Restoring DLNA cache"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3581 3581 
   echo '    restore_directory_from_usb /root/tempdlna dlna' >> /usr/bin/$RESTORE_SCRIPT_NAME
3582 3582 
   echo "    cp -r /root/tempdlna/${RESTORE_SUBDIR}/cache/minidlna/* /var/cache/minidlna/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3583 3583 
   echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3584 
-  echo "      umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3585 
-  echo "      rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3584 
+  echo '      umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3585 
+  echo '      rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3586 3586 
   echo '      exit 982' >> /usr/bin/$RESTORE_SCRIPT_NAME
3587 3587 
   echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3588 3588 
   echo '    rm -rf /root/tempdlna' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3590,7 +3590,7 @@ function create_restore_script {
3590 3590 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3591 3591 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3592 3592
3593 
-  echo "if [ -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3593 
+  echo 'if [ -d $USB_MOUNT/backup/voip ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3594 3594 
   echo '  echo "Restoring VoIP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3595 3595 
   echo '  restore_directory_from_usb /root/tempvoip voip' >> /usr/bin/$RESTORE_SCRIPT_NAME
3596 3596 
   RESTORE_SUBDIR='home'
 
@@ -3601,8 +3601,8 @@ function create_restore_script {
3601 3601 
   echo -n '$MY_USERNAME/tempbackup/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3602 3602 
   echo "$VOIP_CONFIG_FILE /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3603 3603 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3604 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3605 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3604 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3605 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3606 3606 
   echo '    rm -rf /root/tempvoip' >> /usr/bin/$RESTORE_SCRIPT_NAME
3607 3607 
   echo '    exit 3679' >> /usr/bin/$RESTORE_SCRIPT_NAME
3608 3608 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3610,8 +3610,8 @@ function create_restore_script {
3610 3610 
   echo -n '$MY_USERNAME/tempbackup/' >> /usr/bin/$RESTORE_SCRIPT_NAME
3611 3611 
   echo "$VOIP_DATABASE /var/lib/mumble-server/" >> /usr/bin/$RESTORE_SCRIPT_NAME
3612 3612 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3613 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3614 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3613 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3614 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3615 3615 
   echo '    rm -rf /root/tempvoip' >> /usr/bin/$RESTORE_SCRIPT_NAME
3616 3616 
   echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3617 3617 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3622,20 +3622,20 @@ function create_restore_script {
3622 3622 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3623 3623 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3624 3624
3625 
-  echo "if [ -d $USB_MOUNT/backup/tox ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
3625 
+  echo 'if [ -d $USB_MOUNT/backup/tox ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3626 3626 
   echo '  echo "Restoring Tox node settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3627 3627 
   echo '  restore_directory_from_usb /var/lib/tox-bootstrapd tox' >> /usr/bin/$RESTORE_SCRIPT_NAME
3628 3628 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3629 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3630 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3629 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3630 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3631 3631 
   echo '    exit 6393' >> /usr/bin/$RESTORE_SCRIPT_NAME
3632 3632 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3633 3633 
   echo '  cp /var/lib/tox-bootstrapd/tox-bootstrapd.conf /etc/tox-bootstrapd.conf' >> /usr/bin/$RESTORE_SCRIPT_NAME
3634 3634 
   echo '  systemctl restart tox-bootstrapd.service' >> /usr/bin/$RESTORE_SCRIPT_NAME
3635 3635 
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3636 3636 
   echo '    systemctl status tox-bootstrapd.service' >> /usr/bin/$RESTORE_SCRIPT_NAME
3637 
-  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3638 
-  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3637 
+  echo '    umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3638 
+  echo '    rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3639 3639 
   echo '    exit 59369' >> /usr/bin/$RESTORE_SCRIPT_NAME
3640 3640 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3641 3641 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -3644,8 +3644,8 @@ function create_restore_script {
3644 3644 
   echo 'sync' >> /usr/bin/$RESTORE_SCRIPT_NAME
3645 3645 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3646 3646 
   echo "# Unmount the USB drive" >> /usr/bin/$RESTORE_SCRIPT_NAME
3647 
-  echo "umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3648 
-  echo "rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3647 
+  echo 'umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3648 
+  echo 'rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3649 3649 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3650 3650 
   if [[ $BACKUP_INCLUDES_WEBSITES == "yes" ]]; then
3651 3651 
       echo "# Restart the web server" >> /usr/bin/$RESTORE_SCRIPT_NAME