Merge pull request #248 from Dashboy1998/wait-for-backups

Added waiting for backups to complete before stopping
thijsvanloef · Feb 1, 2024 · b90c41c · b90c41c
2 parents 689674b + 9c8b6f8
commit b90c41c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/scripts/backup.sh b/scripts/backup.sh
@@ -8,6 +8,7 @@ DATE=$(date +"%Y-%m-%d_%H-%M-%S")
 FILE_PATH="/palworld/backups/palworld-save-${DATE}.tar.gz"
 cd /palworld/Pal/ || exit
 
+echo "Creating backup"
 tar -zcf "$FILE_PATH" "Saved/"
 
 if [ "$(id -u)" -eq 0 ]; then

diff --git a/scripts/init.sh b/scripts/init.sh
@@ -19,12 +19,20 @@ term_handler() {
     else # Does not save
         kill -SIGTERM "$(pidof PalServer-Linux-Test)"
     fi
-    tail --pid=$killpid -f 2>/dev/null
+    tail --pid="$killpid" -f 2>/dev/null
 }
 
 trap 'term_handler' SIGTERM
 
 su steam -c ./start.sh &
 # Process ID of su
 killpid="$!"
-wait $killpid
+wait "$killpid"
+
+mapfile -t backup_pids < <(pgrep backup)
+if [ "${#backup_pids[@]}" -ne 0 ]; then
+    echo "Waiting for backup to finish"
+    for pid in "${backup_pids[@]}"; do
+        tail --pid="$pid" -f 2>/dev/null
+    done
+fi