Bob Mottram 10 лет назад
Родитель
Сommit
878cb0dd02
1 измененных файлов: 24 добавлений и 0 удалений
  1. 24
    0
      install-freedombone.sh

+ 24
- 0
install-freedombone.sh Просмотреть файл

@@ -705,12 +705,16 @@ function create_backup_script {
705 705
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
706 706
       echo '   exit 593' >> /usr/bin/$BACKUP_SCRIPT_NAME
707 707
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
708
+      echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
708 709
   fi
709 710
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
710 711
       BACKUP_INCLUDES_DATABASES="yes"
711 712
       echo "if [ ! -d $USB_MOUNT/backup/owncloud ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
712 713
       echo "  mkdir -p $USB_MOUNT/backup/owncloud" >> /usr/bin/$BACKUP_SCRIPT_NAME
713 714
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
715
+      echo "if [ ! -d $USB_MOUNT/backup/owncloud2 ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
716
+      echo "  mkdir -p $USB_MOUNT/backup/owncloud2" >> /usr/bin/$BACKUP_SCRIPT_NAME
717
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
714 718
       echo "if [ ! -d $USB_MOUNT/backup/ownclouddata ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
715 719
       echo "  mkdir -p $USB_MOUNT/backup/ownclouddata" >> /usr/bin/$BACKUP_SCRIPT_NAME
716 720
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -744,6 +748,13 @@ function create_backup_script {
744 748
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
745 749
       echo '  exit 632' >> /usr/bin/$BACKUP_SCRIPT_NAME
746 750
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
751
+      echo "rsyncrypto -v -r /etc/owncloud $USB_MOUNT/backup/owncloud2 $USB_MOUNT/backup/owncloud2.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
752
+      echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
753
+      echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
754
+      echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
755
+      echo '  exit 632' >> /usr/bin/$BACKUP_SCRIPT_NAME
756
+      echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
757
+      echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
747 758
   fi
748 759
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
749 760
       echo "if [ ! -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -756,6 +767,7 @@ function create_backup_script {
756 767
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
757 768
       echo '  exit 964' >> /usr/bin/$BACKUP_SCRIPT_NAME
758 769
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
770
+      echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
759 771
   fi
760 772
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
761 773
       echo "if [ ! -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -768,6 +780,7 @@ function create_backup_script {
768 780
       echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
769 781
       echo '  exit 854' >> /usr/bin/$BACKUP_SCRIPT_NAME
770 782
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
783
+      echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
771 784
   fi
772 785
 
773 786
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -1427,6 +1440,9 @@ function create_restore_script {
1427 1440
       echo '  if [ ! -d /root/tempowncloud ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1428 1441
       echo '    mkdir /root/tempowncloud' >> /usr/bin/$RESTORE_SCRIPT_NAME
1429 1442
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1443
+      echo '  if [ ! -d /root/tempowncloud2 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1444
+      echo '    mkdir /root/tempowncloud2' >> /usr/bin/$RESTORE_SCRIPT_NAME
1445
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1430 1446
       echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/owncloud /root/tempowncloud $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1431 1447
       echo "  cp -r /root/tempowncloud/usb/backup/owncloud/lib/owncloud/* /var/lib/owncloud/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1432 1448
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -1434,7 +1450,15 @@ function create_restore_script {
1434 1450
       echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1435 1451
       echo '    exit 981' >> /usr/bin/$RESTORE_SCRIPT_NAME
1436 1452
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1453
+      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/owncloud2 /root/tempowncloud2 $USB_MOUNT/backup/owncloud2.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1454
+      echo "  cp -r /root/tempowncloud2/usb/backup/owncloud/owncloud/* /etc/owncloud/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1455
+      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1456
+      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1457
+      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1458
+      echo '    exit 982' >> /usr/bin/$RESTORE_SCRIPT_NAME
1459
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1437 1460
       echo '  rm -rf /root/tempowncloud' >> /usr/bin/$RESTORE_SCRIPT_NAME
1461
+      echo '  rm -rf /root/tempowncloud2' >> /usr/bin/$RESTORE_SCRIPT_NAME
1438 1462
       echo '  rm -rf /root/tempownclouddata' >> /usr/bin/$RESTORE_SCRIPT_NAME
1439 1463
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1440 1464
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME