Bob Mottram il y a 10 ans
Parent
révision
93589120c9
1 fichiers modifiés avec 12 ajouts et 7 suppressions
  1. 12
    7
      install-freedombone.sh

+ 12
- 7
install-freedombone.sh Voir le fichier

@@ -315,8 +315,8 @@ function create_backup_script {
315 315
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
316 316
   echo 'GPG_KEY=$1' >> /usr/bin/$BACKUP_SCRIPT_NAME
317 317
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
318
-  echo 'if [ ! "$GPG_KEY" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
319
-  echo "  if [ ! '$MY_GPG_PUBLIC_KEY_ID' ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
318
+  echo 'if [ ! $GPG_KEY ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
319
+  echo "  if [ ! $MY_GPG_PUBLIC_KEY_ID ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
320 320
   echo '    echo "You need to specify a GPG key ID with which to create the backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
321 321
   echo '    exit 1' >> /usr/bin/$BACKUP_SCRIPT_NAME
322 322
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -364,31 +364,36 @@ function create_backup_script {
364 364
   echo '# Backup the public mailing list' >> /usr/bin/$BACKUP_SCRIPT_NAME
365 365
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
366 366
   echo '  echo "Backing up the public mailing list"' >> /usr/bin/$BACKUP_SCRIPT_NAME
367
-  echo "  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems $PUBLIC_MAILING_LIST_DIRECTORY file://$USB_MOUNT/backup/publicmailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
367
+  echo -n '  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
368
+  echo "$PUBLIC_MAILING_LIST_DIRECTORY file://$USB_MOUNT/backup/publicmailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
368 369
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
369 370
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
370 371
   echo '# Backup xmpp settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
371 372
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
372 373
   echo '  echo "Backing up the XMPP settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
373
-  echo "  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems $XMPP_DIRECTORY file://$USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
374
+  echo -n '  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
375
+  echo "$XMPP_DIRECTORY file://$USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
374 376
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
375 377
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
376 378
   echo '# Backup web content and other stuff' >> /usr/bin/$BACKUP_SCRIPT_NAME
377 379
   echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
378 380
   echo '  echo "Backing up web content and miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
379
-  echo "  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems /home/$MY_USERNAME/tempfiles file://$USB_MOUNT/backup/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
381
+  echo -n '  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
382
+  echo "/home/$MY_USERNAME/tempfiles file://$USB_MOUNT/backup/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
380 383
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
381 384
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
382 385
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
383 386
   echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
384 387
   echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
385
-  echo "  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems /home/$MY_USERNAME/Maildir file://$USB_MOUNT/backup/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
388
+  echo -n '  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
389
+  echo "/home/$MY_USERNAME/Maildir file://$USB_MOUNT/backup/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
386 390
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
387 391
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
388 392
   echo '# Backup DLNA cache' >> /usr/bin/$BACKUP_SCRIPT_NAME
389 393
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
390 394
   echo '  echo "Backing up DLNA cache"' >> /usr/bin/$BACKUP_SCRIPT_NAME
391
-  echo "  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems /var/cache/minidlna file://$USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
395
+  echo -n '  duplicity incr --encrypt-key $GPG_KEY --full-if-older-than 4W --exclude-other-filesystems ' >> /usr/bin/$BACKUP_SCRIPT_NAME
396
+  echo "/var/cache/minidlna file://$USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
392 397
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
393 398
 
394 399
   echo 'echo "Cleaning up backup files"' >> /usr/bin/$BACKUP_SCRIPT_NAME