Merge remote-tracking branch 'upstream/main' into add-resotre

Dockerfile

@@ -42,6 +42,8 @@ ENV PORT= \
     TZ=UTC \
     SERVER_DESCRIPTION= \
     BACKUP_ENABLED=true \
+    DELETE_OLD_BACKUPS=false \
+    OLD_BACKUP_DAYS=30 \
     BACKUP_CRON_EXPRESSION="0 0 * * *" \
     AUTO_UPDATE_ENABLED=false \
     AUTO_UPDATE_CRON_EXPRESSION="0 * * * *" \

README.md

@@ -20,7 +20,7 @@
 This is a Docker container to help you get started with hosting your own
 [Palworld](https://store.steampowered.com/app/1623730/Palworld/) dedicated server.
 
-This Docker container has been tested and will work on both Linux (Ubuntu/Debian) and Windows 10.
+This Docker container has been tested and will work on Linux (Ubuntu/Debian), Windows 10 and macOS (including Apple Silicon).
 
 > [!IMPORTANT]
 > At the moment, Xbox GamePass/Xbox Console players will not be able to join a dedicated server.

docs/kr/README.md

@@ -18,7 +18,7 @@
 
 [Palworld](https://store.steampowered.com/app/1623730/Palworld/) 전용 서버 호스팅을 시작하는 데 도움이 되는 Docker 컨테이너입니다.
 
-이 도커 컨테이너는 테스트되었으며 Linux(Ubuntu/Debian) 및 Windows 10 모두에서 작동합니다.
+이 도커 컨테이너는 테스트되었으며 Linux(Ubuntu/Debian), Windows 10 및 macOS (Apple Silicon 포함) 모두에서 작동합니다.
 
 > [!Important]
 > 현재 Xbox Gamepass/Xbox 콘솔 플레이어는 전용 서버에 참여할 수 없습니다.

scripts/backup.sh

@@ -1,22 +1,29 @@
 #!/bin/bash
 
 if [ "${RCON_ENABLED}" = true ]; then
-        rcon-cli -c /home/steam/server/rcon.yaml save
+    rcon-cli -c /home/steam/server/rcon.yaml save
 fi
 
 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
-        chown steam:steam "$FILE_PATH"
+    chown steam:steam "$FILE_PATH"
 fi
 
 echo "backup created at $FILE_PATH"
 
 if [ "${DELETE_OLD_BACKUPS}" = true ]; then
-        echo "removing backups older than ${OLD_BACKUP_DAYS:=30} days"
-        find /palworld/backups/ -mindepth 1 -maxdepth 1 -mtime "+${OLD_BACKUP_DAYS}" -print -delete
+    if [ -z "${OLD_BACKUP_DAYS}" ]; then
+        echo "Unable to deleted old backups, OLD_BACKUP_DAYS is empty."
+    elif [[ "${OLD_BACKUP_DAYS}" =~ ^[0-9]+$ ]]; then
+        echo "removing backups older than ${OLD_BACKUP_DAYS} days"
+        find /palworld/backups/ -mindepth 1 -maxdepth 1 -mtime "+${OLD_BACKUP_DAYS}" -type f -name 'palworld-save-*.tar.gz' -print -delete
+    else
+        echo "Unable to deleted old backups, OLD_BACKUP_DAYS is not an integer. OLD_BACKUP_DAYS=${OLD_BACKUP_DAYS}"
+    fi
 fi

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