Move countdown to function for auto update and auto reboot

scripts/auto_reboot.sh

@@ -15,11 +15,7 @@ if [ "${RCON_ENABLED,,}" = true ]; then
     if [ -z "${AUTO_REBOOT_WARN_MINUTES}" ]; then
         echo "Unable to auto reboot, AUTO_REBOOT_WARN_MINUTES is empty."
     elif [[ "${AUTO_REBOOT_WARN_MINUTES}" =~ ^[0-9]+$ ]]; then
-        for ((i = "${AUTO_REBOOT_WARN_MINUTES}" ; i > 0 ; i--)); do
-            rcon-cli -c /home/steam/server/rcon.yaml "broadcast The_Server_will_reboot_in_${i}_Minutes"
-            sleep "1m"
-        done
-
+        countdown_message "${AUTO_REBOOT_WARN_MINUTES}" "The_Server_will_reboot_in"
         rcon-cli -c /home/steam/server/rcon.yaml save
         rcon-cli -c /home/steam/server/rcon.yaml "shutdown 1"
     else

scripts/helper_functions.sh

@@ -77,4 +77,38 @@ get_player_count() {
     fi
     player_list=$(rcon-cli -c /home/steam/server/rcon.yaml "ShowPlayers")
     echo -n "${player_list}" | wc -l
-}
+}
+
+# Given an amount of time in minutes and a message prefix
+countdown_message() {
+    mtime="$1"
+    message_prefix="$2"
+
+    for ((i = "${mtime}" ; i > 0 ; i--)); do
+        if [ "$i" -eq 1 ]; then
+            rcon-cli -c /home/steam/server/rcon.yaml "broadcast ${message_prefix}_${i}_minutue"
+            sleep 30s
+            rcon-cli -c /home/steam/server/rcon.yaml "broadcast ${message_prefix}_30_seconds"
+            sleep 20s
+            rcon-cli -c /home/steam/server/rcon.yaml "broadcast ${message_prefix}_10_seconds"
+            sleep 10s
+        else
+            case "$i" in
+                "$mtime" )
+                    ;&
+                15 )
+                    ;&
+                10 )
+                    ;&
+                5 )
+                    ;&
+                2 )
+                    rcon-cli -c /home/steam/server/rcon.yaml "broadcast ${message_prefix}_${i}_minutues"
+                    ;&
+                * ) 
+                    sleep 1m
+                    ;;
+            esac
+        fi
+    done   
+}

scripts/update.sh

@@ -41,18 +41,24 @@ if [ "$CURRENT_MANIFEST" != "$TARGET_MANIFEST" ]; then
         fi
         exit 0
     fi
-    echo "New Build was found. Updating the server from $CURRENT_MANIFEST to $TARGET_MANIFEST."
-    rm /palworld/steamapps/appmanifest_2394010.acf
 
-    if [ "$(get_player_count)" -gt 0 ]; then
-        if [ -n "${DISCORD_WEBHOOK_URL}" ]; then
-        /home/steam/server/discord.sh "Server will update in ${AUTO_UPDATE_WARN_MINUTES} minutes" "info" &
+    if [ -z "${AUTO_UPDATE_WARN_MINUTES}" ]; then
+        echo "Unable to auto update, AUTO_UPDATE_WARN_MINUTES is empty."
+    elif [[ "${AUTO_UPDATE_WARN_MINUTES}" =~ ^[0-9]+$ ]]; then
+        echo "New Build was found. Updating the server from $CURRENT_MANIFEST to $TARGET_MANIFEST."
+        rm /palworld/steamapps/appmanifest_2394010.acf
+
+        if [ "$(get_player_count)" -gt 0 ]; then
+            if [ -n "${DISCORD_WEBHOOK_URL}" ]; then
+                /home/steam/server/discord.sh "Server will update in ${AUTO_UPDATE_WARN_MINUTES} minutes" "info" &
+            fi
+            countdown_message "${AUTO_UPDATE_WARN_MINUTES}" "Server_will_update_in"
         fi
-        rcon-cli -c /home/steam/server/rcon.yaml "broadcast Server_will_update_in_${AUTO_UPDATE_WARN_MINUTES}_Minutes"
-        sleep "${AUTO_UPDATE_WARN_MINUTES}m"
+        backup
+        rcon-cli -c /home/steam/server/rcon.yaml "shutdown 1"
+    else
+        echo "Unable to auto update, AUTO_UPDATE_WARN_MINUTES is not an integer: ${AUTO_UPDATE_WARN_MINUTES}"
     fi
-    backup
-    rcon-cli -c /home/steam/server/rcon.yaml "shutdown 1"
 else
     echo "The Server is up to date!"
-fi
+fi