Add save and shutdown functions

scripts/auto_reboot.sh

@@ -20,8 +20,7 @@ if [ "${RCON_ENABLED,,}" = true ]; then
             sleep "1m"
         done
 
-        rcon-cli -c /home/steam/server/rcon.yaml save
-        rcon-cli -c /home/steam/server/rcon.yaml "shutdown 1"
+        shutdown_server
     else
         echo "Unable to auto reboot, AUTO_REBOOT_WARN_MINUTES is not an integer: ${AUTO_REBOOT_WARN_MINUTES}"
     fi

scripts/backup.sh

@@ -4,9 +4,7 @@ if [ -n "${DISCORD_WEBHOOK_URL}" ]; then
     /home/steam/server/discord.sh "Creating backup..." "in-progress" &
 fi
 
-if [ "${RCON_ENABLED,,}" = true ]; then
-    rcon-cli -c /home/steam/server/rcon.yaml save
-fi
+save_server
 
 DATE=$(date +"%Y-%m-%d_%H-%M-%S")
 FILE_PATH="/palworld/backups/palworld-save-${DATE}.tar.gz"

scripts/helper_functions.sh

@@ -77,4 +77,35 @@ get_player_count() {
     fi
     player_list=$(rcon-cli -c /home/steam/server/rcon.yaml "ShowPlayers")
     echo -n "${player_list}" | wc -l
-}
+}
+
+# Saves the server
+# Returns 0 if it saves
+# Returns 1 if it is not able to save
+save_server() {
+    local return_val=0
+    if [ "${RCON_ENABLED,,}" = true ]; then
+        rcon-cli -c /home/steam/server/rcon.yaml save
+    else
+        return_val=1
+    fi
+    return "$return_val"
+}
+
+# Saves then shutdowns the server
+# Returns 0 if it is shutdown
+# Returns 1 if it is not able to be shutdown
+shutdown_server() {
+    local return_val=0
+    if [ "${RCON_ENABLED,,}" = true ]; then
+        # Do not shutdown if not able to save
+        if save_server; then
+            rcon-cli -c /home/steam/server/rcon.yaml "shutdown 1"
+        else
+            return_val=1
+        fi
+    else
+        return_val=1
+    fi
+    return "$return_val"
+}

scripts/init.sh

@@ -18,10 +18,8 @@ term_handler() {
         su steam -c "/home/steam/server/discord.sh '${DISCORD_PRE_SHUTDOWN_MESSAGE}' in-progress" &
     fi
 
-    if [ "${RCON_ENABLED,,}" = true ]; then
-        rcon-cli save
-        rcon-cli "shutdown 1"
-    else # Does not save
+    if ! shutdown_server; then
+        # If it fails then kill the server
         kill -SIGTERM "$(pidof PalServer-Linux-Test)"
     fi
 

scripts/restore.sh

@@ -61,8 +61,7 @@ if [ -f "$BACKUP_FILE" ]; then
 
         if [ "${RCON_ENABLED}" = true ]; then
             printf "\e[0;32m*****SHUTDOWN SERVER*****\e[0m\n"
-            rcon-cli -c /home/steam/server/rcon.yaml save
-            rcon-cli -c /home/steam/server/rcon.yaml "shutdown 1"
+            shutdown_server
         else
             echo "RCON is not enabled. Please enable RCON to use this feature. Unable to restore backup."
             exit 1

scripts/update.sh

@@ -52,7 +52,7 @@ if [ "$CURRENT_MANIFEST" != "$TARGET_MANIFEST" ]; then
         sleep "${AUTO_UPDATE_WARN_MINUTES}m"
     fi
     backup
-    rcon-cli -c /home/steam/server/rcon.yaml "shutdown 1"
+    shutdown_server
 else
     echo "The Server is up to date!"
 fi