free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fixing restore

Bob Mottram 10 years ago
parent
deab54d948
commit
7fed95bc56
1 changed files with 33 additions and 31 deletions
Unified View Show Diff Stats
  1. 33
    31
      install-freedombone.sh

+ 33
- 31
install-freedombone.sh View File

1436 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 1436 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1437 
   fi
 1437 
   fi
1438
1438
1439 
-  if grep -Fxq "install_wiki" $COMPLETION_FILE; then
1440 
-      echo "if [ -f /home/$MY_USERNAME/tempfiles/wiki.tar.gz ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1441 
-      echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1442 
-      echo '  mkdir /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
1443 
-      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/wiki /root/tempwiki $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1444 
-      echo "  cp -r /root/tempwiki/usb/backup/wiki/lib/dokuwiki/* /var/lib/dokuwiki/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1445 
-      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1446 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1447 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1448 
-      echo '    exit 868' >> /usr/bin/$RESTORE_SCRIPT_NAME
1449 
-      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1450 
-      echo '  rm -rf /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
1451 
-      echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1452 
-      echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1453 
-  fi
1439 
+  echo "if [ -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1440 
+  echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1441 
+  echo '  mkdir /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
1442 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/wiki /root/tempwiki $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1443 
+  echo "  cp -r /root/tempwiki/usb/backup/wiki/lib/dokuwiki/* /var/lib/dokuwiki/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1444 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1445 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1446 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1447 
+  echo '    exit 868' >> /usr/bin/$RESTORE_SCRIPT_NAME
1448 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1449 
+  echo '  rm -rf /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
1450 
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1451 
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1454
1452
1455 
-  if grep -Fxq "install_blog" $COMPLETION_FILE; then
1456 
-      echo "if [ -f /home/$MY_USERNAME/tempfiles/blog.tar.gz ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1457 
-      echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1458 
-      echo '  mkdir /root/tempblog' >> /usr/bin/$RESTORE_SCRIPT_NAME
1459 
-      echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/blog /root/tempblog $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1460 
-      echo "  rm -rf /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
1461 
-      echo "  mv /root/tempblog/usb/backup/blog/www/$FULLBLOG_DOMAIN_NAME/htdocs /var/www/$FULLBLOG_DOMAIN_NAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1462 
-      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1463 
-      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1464 
-      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1465 
-      echo '    exit 593' >> /usr/bin/$RESTORE_SCRIPT_NAME
1466 
-      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1467 
-      echo '  rm -rf /root/tempblog' >> /usr/bin/$RESTORE_SCRIPT_NAME
1468 
-      echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1469 
-      echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1470 
-  fi
1453 
+  echo "if [ -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1454 
+  echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1455 
+  echo '  mkdir /root/tempblog' >> /usr/bin/$RESTORE_SCRIPT_NAME
1456 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/blog /root/tempblog $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1457 
+  echo "  rm -rf /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
1458 
+  echo "  cp -r /root/tempblog/usb/backup/blog/www/$FULLBLOG_DOMAIN_NAME/htdocs /var/www/$FULLBLOG_DOMAIN_NAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1459 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1460 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1461 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1462 
+  echo '    exit 593' >> /usr/bin/$RESTORE_SCRIPT_NAME
1463 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1464 
+  echo '  rm -rf /root/tempblog' >> /usr/bin/$RESTORE_SCRIPT_NAME
1465 
+  echo "  if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/content ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1466 
+  echo '    echo "No content directory found after restoring blog"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1467 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1468 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1469 
+  echo '    exit 287' >> /usr/bin/$RESTORE_SCRIPT_NAME
1470 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1471 
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1472 
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1471
1473
1472 
   echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
 1474 
   echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1473 
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
 1475 
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME