From 2a13366498ad1e07365d9f2a28e8a90f07aa955c Mon Sep 17 00:00:00 2001
From: Guillaume Barreau <guillaume.barreau@raisepartner.com>
Date: Fri, 26 Jan 2024 23:57:07 -0500
Subject: [PATCH] refactor: :fire: Update main branch

---
 .DS_Store          | Bin 0 -> 8196 bytes
 Dockerfile         |   6 +++---
 docker-compose.yml |   9 +++++----
 scripts/backup.sh  |  10 ++++++----
 scripts/start.sh   |  17 +++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a660ad9a8fccc9ea22622d5273d33dbaf00dfa2b
GIT binary patch
literal 8196
zcmeI1&u$V?6vod5l)=V?7){uiOyU-iT0j~%l)|Eky66~Ps6mE7JLz<WFi_GEl3D9J
z_zG@)65qv@e)o?C1{!0USR2nt?)~oEIUmFPa+%8kA`<PXw@p+cA`4AwaSPpskmqGv
zi;S7M2^H`Y4QWjGX+RO3tYz~A6JP>NfC(@GCh#v1z@9C`I%nV4XSrtrOyIvHAfFF5
zn$(ujM5}sqpi?CPG>2&w7^4nQ9@}WkXrfhF@tV4N5XLG@i6OKd=WUq|Z5d6pYC8#S
zCt<EEOobxU)#0;MI*FE6?wJ4+SSKKB_gmzlVjs})O8q{<T#T6touQf!4uWXl29b+=
z`4QVgt9)015z!6mEWO4%@+qKU%JVtp$>NGlidVD5-OX9<EFPKbe{n~FA5W^)uOgGp
zUAvyQ^46C1#yN^+&ZIw?#_j(2l{|VLMS=Ts+;?C2!&$F*dp`;%eLozImBIIhNO}Fz
z54~vCj;5g(E3czZSOu%lE0*T-TBBaJYt2WCvOV8@SjBj!u~-zWJNF(uKI|O_Ct>tK
zg21E4JfcXlU5<}9F!y}wjKd%b-(yB*=jjO@&^~qP89CHV5s|)S))tMZ556-HA49!V
z{<q)dUpmX(8u-<l7i77{Aw{)7hakF#mH8A}!75IX%1HjpWb;_@12FYLc#>Y3YR!LI
zTJx#wOQ*WiDBJbz#s#US?kdGJ0WqvtwZze>T^P#yKe%u(fvZFytKV!%*8kn}fB(Nq
zx5V$22{3^_Bp`Afr_+W>?dluMa+kN!-lEBnd5KnKLAUZn0LQ=nFvQqKs`RvsCR#Cr
P;2#1M2JV=^UnTGZhl3@Y

literal 0
HcmV?d00001

diff --git a/Dockerfile b/Dockerfile
index f5f5c83..275346d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,9 +32,9 @@ ENV PORT= \
     RCON_PORT=25575 \
     QUERY_PORT=27015 \
     TZ=UTC \
-    BACKUP_ENABLED=true \
-    DAYS_TO_KEEP=7 \
-    BACKUP_CRON_EXPRESSION="0 0 * * *"
+    BACKUP_ENABLED=false \
+    DAYS_TO_KEEP= \
+    BACKUP_CRON_EXPRESSION=
 
 COPY ./scripts/* /home/steam/server/
 RUN chmod +x /home/steam/server/init.sh /home/steam/server/start.sh /home/steam/server/backup.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index b18c716..e572b87 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
    palworld:
-      image: thijsvanloef/palworld-server-docker:latest
+      image: test/palworld-server-docker:latest
+      build: .
       restart: unless-stopped
       container_name: palworld-server
       ports:
@@ -17,9 +18,9 @@ services:
          - TZ=UTC
          - ADMIN_PASSWORD="adminPasswordHere"
          - COMMUNITY=false  # Enable this if you want your server to show up in the community servers tab, USE WITH SERVER_PASSWORD!
-         - BACKUP_ENABLED=false
-         - DAYS_TO_KEEP=7
-         - BACKUP_CRON_EXPRESSION=0 0 * * *
+         - BACKUP_ENABLED=true
+         - DAYS_TO_KEEP=
+         - BACKUP_CRON_EXPRESSION=
          # Enable the environment variables below if you have COMMUNITY=true
          # - SERVER_PASSWORD="worldofpals"
          # - SERVER_NAME="World of Pals"
diff --git a/scripts/backup.sh b/scripts/backup.sh
index 712a0db..4444997 100644
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -5,7 +5,7 @@ DESTINATION_PATH="/palworld/backups"
 FILE_PATH="${DESTINATION_PATH}/backup_palworld_${DATE}.tar.gz"
 
 if [ ! -f ${FILE_PATH} ]; then
-    echo "\e[0;32m***** CREATING BACKUPS FOLDER *****\e[0m\n"
+    printf "\e[0;32m***** CREATING BACKUPS FOLDER *****\e[0m\n"
     mkdir -p "${DESTINATION_PATH}"
 fi
 
@@ -16,9 +16,11 @@ echo "backup created at $FILE_PATH"
 
 if [[ -n "${DAYS_TO_KEEP}" && "${DAYS_TO_KEEP}" =~ ^[0-9]+$ ]]; then
     echo "DAYS_TO_KEEP=${DAYS_TO_KEEP}"
-    find "${DESTINATION_PATH}" -type f -mtime +"${DAYS_TO_KEEP}" -exec rm {} \;
-else
-    echo "DAYS_TO_KEEP is not a valid number."
+    if [[ "${DAYS_TO_KEEP}" -gt 0 ]]; then
+        find "${DESTINATION_PATH}" -type f -mtime +"${DAYS_TO_KEEP}" -exec rm {} \;
+    else
+        echo "DAYS_TO_KEEP is zero. No files will be removed."
+    fi
 fi
 
 
diff --git a/scripts/start.sh b/scripts/start.sh
index 8e0cc1b..6587107 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -67,19 +67,16 @@ if [ -n "${RCON_PORT}" ]; then
     sed -i "s/RCONPort=[0-9]*/RCONPort=$RCON_PORT/" /palworld/Pal/Saved/Config/LinuxServer/PalWorldSettings.ini
 fi
 
-if [[ -n "${BACKUP_ENABLED}" ]]; then
+if [[ -n $BACKUP_ENABLED ]]; then
     echo "BACKUP_ENABLED=${BACKUP_ENABLED}"
 
-    if [[ -z "${BACKUP_CRON_EXPRESSION}" ]]; then
-        printf "\e[0;31m***** BACKUP_CRON_EXPRESSION NOT SET *****\e[0m\n"
-        exit 1
-    else
-        echo "BACKUP_CRON_EXPRESSION=${BACKUP_CRON_EXPRESSION}"
+    if [[ $BACKUP_ENABLED == true ]]; then
+        CRON_EXPRESSION=$([[ -n $BACKUP_CRON_EXPRESSION ]] && echo "$BACKUP_CRON_EXPRESSION" || echo "0 0 * * *")
+        echo "CRON_EXPRESSION=${CRON_EXPRESSION}"
+        echo "${CRON_EXPRESSION} root bash /usr/loca/bin/backup" > /etc/cron.d/backups-cron
+        chmod 0644 /etc/cron.d/backups-cron
+        cron /etc/cron.d/backups-cron
     fi
-
-    echo "${BACKUP_CRON_EXPRESSION} root bash /usr/local/bin/backup" > /etc/cron.d/backups-cron
-    chmod 0644 /etc/cron.d/backups-cron
-    cron /etc/cron.d/backups-cron
 fi
 
 # Configure RCON settings