From 00b24653796424e1a095bd6634e844e194fdc405 Mon Sep 17 00:00:00 2001 From: Apoorv Parle <19315187+apparle@users.noreply.github.com> Date: Sun, 22 Jun 2025 02:17:25 -0700 Subject: [PATCH 1/2] Add check in daily-backup.sh for uninitialized state Signed-off-by: Apoorv Parle <19315187+apparle@users.noreply.github.com> --- Containers/mastercontainer/daily-backup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Containers/mastercontainer/daily-backup.sh b/Containers/mastercontainer/daily-backup.sh index 13c0ad85..fbb49c70 100644 --- a/Containers/mastercontainer/daily-backup.sh +++ b/Containers/mastercontainer/daily-backup.sh @@ -2,6 +2,13 @@ echo "Daily backup script has started" +# Check if initial configuration has been done, otherwise this script should do nothing. +configFile=/mnt/docker-aio-config/data/configuration.json +if [ ! -f "$configFile" ] || ! grep -q -E '"wasStartButtonClicked"\s*:\s*1\s*,' "$configFile"; then + echo "Initial configuration not done yet. Exiting..." + exit 0 +fi + # Daily backup and backup check cannot be run at the same time if [ "$DAILY_BACKUP" = 1 ] && [ "$CHECK_BACKUP" = 1 ]; then echo "Daily backup and backup check cannot be run at the same time. Exiting..." From 108dcf6c486ed9a1ce740e44d609d5889fe2ae1e Mon Sep 17 00:00:00 2001 From: Apoorv Parle <19315187+apparle@users.noreply.github.com> Date: Tue, 24 Jun 2025 01:24:26 -0700 Subject: [PATCH 2/2] Update Containers/mastercontainer/daily-backup.sh based on review comments Co-authored-by: Simon L. Signed-off-by: Apoorv Parle <19315187+apparle@users.noreply.github.com> --- Containers/mastercontainer/daily-backup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containers/mastercontainer/daily-backup.sh b/Containers/mastercontainer/daily-backup.sh index fbb49c70..c68835ea 100644 --- a/Containers/mastercontainer/daily-backup.sh +++ b/Containers/mastercontainer/daily-backup.sh @@ -3,9 +3,9 @@ echo "Daily backup script has started" # Check if initial configuration has been done, otherwise this script should do nothing. -configFile=/mnt/docker-aio-config/data/configuration.json -if [ ! -f "$configFile" ] || ! grep -q -E '"wasStartButtonClicked"\s*:\s*1\s*,' "$configFile"; then - echo "Initial configuration not done yet. Exiting..." +CONFIG_FILE=/mnt/docker-aio-config/data/configuration.json +if ! [ -f "$CONFIG_FILE" ] || ! grep -q "wasStartButtonClicked.*1" "$CONFIG_FILE"; then + echo "Initial configuration via AIO interface not done yet. Exiting..." exit 0 fi