From b22c239998fc010beefd8e0ff4b4e5b229532c43 Mon Sep 17 00:00:00 2001 From: szaimen Date: Fri, 26 Aug 2022 15:04:52 +0200 Subject: [PATCH] fix restoring of addional bakup dirs Signed-off-by: szaimen --- Containers/borgbackup/backupscript.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Containers/borgbackup/backupscript.sh b/Containers/borgbackup/backupscript.sh index 26a9ddd9..c661899c 100644 --- a/Containers/borgbackup/backupscript.sh +++ b/Containers/borgbackup/backupscript.sh @@ -225,6 +225,11 @@ if [ "$BORG_MODE" = restore ]; then exit 1 fi + # Save Additional Backup dirs + if [ -f "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/additional_backup_directories" ]; then + ADDITIONAL_BACKUP_DIRECTORIES="$(cat /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/additional_backup_directories)" + fi + # Restore everything except the configuration file if ! rsync --stats --archive --human-readable -vv --delete \ --exclude "nextcloud_aio_mastercontainer/session/"** \ @@ -243,11 +248,6 @@ if [ "$BORG_MODE" = restore ]; then # Save current path BORG_LOCATION="$(jq '.borg_backup_host_location' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)" - # Save Additional Backup dirs - if [ -f "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/additional_backup_directories" ]; then - ADDITIONAL_BACKUP_DIRECTORIES="$(cat /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/additional_backup_directories)" - fi - # Save current nextcloud datadir if grep -q '"nextcloud_datadir":' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json; then NEXTCLOUD_DATADIR="$(jq '.nextcloud_datadir' /nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/configuration.json)"