Added shutdown and save functions

scripts/auto_reboot.sh

@@ -25,8 +25,7 @@ if [[ "${AUTO_REBOOT_WARN_MINUTES}" =~ ^[0-9]+$ ]]; then
         RCON "broadcast The_Server_will_reboot_in_${i}_Minutes"
         sleep "1m"
     done
-    RCON save
-    RCON "shutdown 1"
+    shutdown_server
     exit 0
 fi
 

scripts/backup.sh

@@ -4,7 +4,7 @@ source "/home/steam/server/helper_functions.sh"
 
 DiscordMessage "Creating backup..." "in-progress"
 if [ "${RCON_ENABLED,,}" = true ]; then
-    RCON save
+    save_server
 fi
 
 DATE=$(date +"%Y-%m-%d_%H-%M-%S")

scripts/helper_functions.sh

@@ -134,6 +134,33 @@ RCON() {
   rcon-cli -c /home/steam/server/rcon.yaml "$args"
 }
 
+# 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 save; then
+        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
+    # Do not shutdown if not able to save
+    if save_server; then
+        if ! RCON "DoExit"; then
+            return_val=1
+        fi
+    else
+        return_val=1
+    fi
+    return "$return_val"
+}
+
 # Helper Functions for installation & updates
 # shellcheck source=/dev/null
 source "/home/steam/server/helper_install.sh"

scripts/init.sh

@@ -28,10 +28,8 @@ mkdir -p /palworld/backups
 term_handler() {
   DiscordMessage "${DISCORD_PRE_SHUTDOWN_MESSAGE}" "in-progress"
 
-    if [ "${RCON_ENABLED,,}" = true ]; then
-        RCON save
-        RCON "shutdown 1"
-    else # Does not save
+    if ! shutdown_server; then
+        # Does not save
         kill -SIGTERM "$(pidof PalServer-Linux-Test)"
     fi
 

scripts/restore.sh

@@ -63,8 +63,7 @@ if [ -f "$BACKUP_FILE" ]; then
 
         if [ "${RCON_ENABLED}" = true ]; then
             LogAction "Shutting Down Server"
-            RCON save
-            RCON "shutdown 1"
+            shutdown_server
         else
             LogWarn "RCON is not enabled. Please enable RCON to use this feature. Unable to restore backup."
             exit 1