exporting a variable from a child process back to the parent process does not work (#2234)

szaimen · web-flow · commit c33fd59c54eb · 2022-02-13T10:04:27.000+01:00
Signed-off-by: szaimen &lt;szaimen@e.mail.de&gt;
diff --git a/addons/database_shrinking.sh b/addons/database_shrinking.sh
@@ -39,11 +39,15 @@ You can find it here: run 'sudo bash $SCRIPTS/menu.sh' -> choose 'Server Configu
     then
         exit 1
     fi
+    rm -f /tmp/DAILY_BACKUP_CREATION_SUCCESSFUL
     export SKIP_DAILY_BACKUP_CHECK=1
     bash "$DAILY_BACKUP_FILE"
-    if ! yesno_box_no "Was the backup successfully? If yes, we will start with the database shrinking now."
+    if ! [ -f "/tmp/DAILY_BACKUP_CREATION_SUCCESSFUL" ]
     then
-        exit 1
+        if ! yesno_box_no "It seems like the backup was not successful. Do you want to continue nonetheless? (Not recommended!)"
+        then
+            exit 1
+        fi
     fi
 fi
 
diff --git a/nextcloud_update.sh b/nextcloud_update.sh
@@ -100,9 +100,10 @@ then
     # Create backup first
     if [ -f "$SCRIPTS/daily-borg-backup.sh" ] && does_snapshot_exist "NcVM-snapshot"
     then
+        rm -f /tmp/DAILY_BACKUP_CREATION_SUCCESSFUL
         export SKIP_DAILY_BACKUP_CHECK=1
         bash "$SCRIPTS/daily-borg-backup.sh"
-        if [ -z "$DAILY_BACKUP_CREATION_SUCCESSFUL" ]
+        if ! [ -f "/tmp/DAILY_BACKUP_CREATION_SUCCESSFUL" ]
         then
             notify_admin_gui "Update failed because backup could not be created!" \
             "Could not create a backup! $(date +%T)"
diff --git a/not-supported/borgbackup.sh b/not-supported/borgbackup.sh
@@ -584,8 +584,9 @@ Please don't restart or shutdown your server until then!"
         remove_log_file
     fi
 
-    # Export a variable that can be checked for
-    export DAILY_BACKUP_CREATION_SUCCESSFUL=1
+    # Create a file that can be checked for
+    rm -f /tmp/DAILY_BACKUP_CREATION_SUCCESSFUL
+    touch /tmp/DAILY_BACKUP_CREATION_SUCCESSFUL
 
     # Exit here if the backup doesn't shall get checked
     if [ -z "$CHECK_BACKUP" ]
@@ -705,7 +706,8 @@ else
     remove_log_file
 fi
 
-# Export a variable that can be checked for
-export DAILY_BACKUP_CHECK_SUCCESSFUL=1
+# Create a file that can be checked for
+rm -f /tmp/DAILY_BACKUP_CHECK_SUCCESSFUL
+touch /tmp/DAILY_BACKUP_CHECK_SUCCESSFUL
 
 exit
diff --git a/not-supported/pi-hole.sh b/not-supported/pi-hole.sh
@@ -223,9 +223,10 @@ notify_admin_gui "Starting the Pi-hole update." "You will be notified when it is
 # Create backup first
 if [ -f "\$SCRIPTS/daily-borg-backup.sh" ]
 then
+    rm -f /tmp/DAILY_BACKUP_CREATION_SUCCESSFUL
     export SKIP_DAILY_BACKUP_CHECK=1
     bash "\$SCRIPTS/daily-borg-backup.sh"
-    if [ -z "\$DAILY_BACKUP_CREATION_SUCCESSFUL" ]
+    if ! [ -f "/tmp/DAILY_BACKUP_CREATION_SUCCESSFUL" ]
         then
             notify_admin_gui "Pi-hole update failed because backup could not be created!" \
             "Could not create a backup! \$(date +%T)"
diff --git a/not-supported/rsyncbackup.sh b/not-supported/rsyncbackup.sh
@@ -134,9 +134,10 @@ then
 fi
 
 # Check daily backup
+rm -f /tmp/DAILY_BACKUP_CHECK_SUCCESSFUL
 export SKIP_DAILY_BACKUP_CREATION=1
 bash "$SCRIPTS/daily-borg-backup.sh"
-if [ -z "$DAILY_BACKUP_CHECK_SUCCESSFUL" ]
+if ! [ -f "/tmp/DAILY_BACKUP_CHECK_SUCCESSFUL" ]
 then
     send_error_mail "Daily backup check failed!" \
     "Backup check was unsuccessful! $(date +%T)"
diff --git a/not-supported/system-restore.sh b/not-supported/system-restore.sh
@@ -113,11 +113,15 @@ then
     then
         exit 1
     fi
+    rm -f /tmp/DAILY_BACKUP_CREATION_SUCCESSFUL
     export SKIP_DAILY_BACKUP_CHECK=1
     bash "$DAILY_BACKUP_FILE"
-    if ! yesno_box_no "Was the backup successfully? If yes, we will continue with the restore script now."
+    if ! [ -f "/tmp/DAILY_BACKUP_CREATION_SUCCESSFUL" ]
     then
-        exit 1
+        if ! yesno_box_no "It seems like the backup was not successful. Do you want to continue nonetheless? (Not recommended!)"
+        then
+            exit 1
+        fi
     fi
 fi
 
