From 6dd9709edba395d8373cab3327a9db793986d9a6 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 26 Jul 2023 21:21:35 +0100
Subject: [PATCH 01/33] fix: add new info about steamcmd failures

This commit fixes an issue in the core_dl.sh script where disk write failures and missing update files were not being handled correctly. Now, when a disk write failure or missing update files occur during the download process, appropriate error messages are displayed and logged.
---
 lgsm/modules/core_dl.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lgsm/modules/core_dl.sh b/lgsm/modules/core_dl.sh
index 405e9dc6b..f85499890 100644
--- a/lgsm/modules/core_dl.sh
+++ b/lgsm/modules/core_dl.sh
@@ -119,6 +119,14 @@ fn_dl_steamcmd() {
 			elif [ -n "$(grep "0x402" "${steamcmdlog}" | tail -1)" ] || [ -n "$(grep "0x602" "${steamcmdlog}" | tail -1)" ]; then
 				fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Update required but not completed - check network"
 				fn_script_log_error "${commandaction} ${selfname}: ${remotelocation}: Update required but not completed - check network"
+			# Disk write failure.
+			elif [ -n "$(grep "0x606" "${steamcmdlog}" | tail -1)" ] || [ -n "$(grep "0x602" "${steamcmdlog}" | tail -1)" ]; then
+				fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Disk write failure"
+				fn_script_log_error "${commandaction} ${selfname}: ${remotelocation}: Disk write failure"
+			# Missing update files.
+			elif [ -n "$(grep "0x626" "${steamcmdlog}" | tail -1)" ] || [ -n "$(grep "0x626" "${steamcmdlog}" | tail -1)" ]; then
+				fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Missing update files"
+				fn_script_log_error "${commandaction} ${selfname}: ${remotelocation}: Missing update files"
 			else
 				fn_print_error2_nl "${commandaction} ${selfname}: ${remotelocation}: Unknown error occured"
 				echo -en "Please provide content log to LinuxGSM developers https://linuxgsm.com/steamcmd-error"

From f68818d62b760affa9ce4c2515207b9c174305b1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 26 Jul 2023 22:12:20 +0100
Subject: [PATCH 02/33] refactor: rename clear-modules command to
 cm;clear-modules

The commit renames the clear-modules command to cm;clear-modules in the core_getopt.sh file. This change improves clarity and consistency in the codebase.
---
 lgsm/modules/core_getopt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/modules/core_getopt.sh b/lgsm/modules/core_getopt.sh
index b191b3ebc..1003839ea 100644
--- a/lgsm/modules/core_getopt.sh
+++ b/lgsm/modules/core_getopt.sh
@@ -55,7 +55,7 @@ cmd_dev_detect_deps=("dd;detect-deps" "command_dev_detect_deps.sh" "Detect requi
 cmd_dev_detect_glibc=("dg;detect-glibc" "command_dev_detect_glibc.sh" "Detect required glibc.")
 cmd_dev_detect_ldd=("dl;detect-ldd" "command_dev_detect_ldd.sh" "Detect required dynamic dependencies.")
 cmd_dev_query_raw=("qr;query-raw" "command_dev_query_raw.sh" "The raw output of gamedig and gsquery.")
-cmd_dev_clear_modules=("cf;clear-modules" "command_dev_clear_modules.sh" "Delete the contents of the modules dir.")
+cmd_dev_clear_modules=("cm;clear-modules" "command_dev_clear_modules.sh" "Delete the contents of the modules dir.")
 
 ### Set specific opt here.
 

From d83e9d9c57009f4c245fbd15985b637883fea21c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 27 Aug 2023 21:50:10 +0100
Subject: [PATCH 03/33] feat: Migrate stats to Google GA-4 (#4295)

* refactor: simplify Google Analytics event tracking

This commit simplifies the code for sending Google Analytics events by using a single POST request instead of multiple cURL commands. The new approach sends all necessary parameters in a JSON payload, reducing redundancy and improving efficiency. Additionally, unnecessary event tracking for summary statistics has been removed.

Co-authored-by: AI Assistant <assistant@example.com>

* add plausable event api

* refactor: remove unnecessary header in info_stats.sh

The commit removes an unnecessary header in the info_stats.sh file. This change simplifies the code and improves readability.

* feat: add country code of external IP address

This commit adds functionality to retrieve the country code of the external IP address. If the country code is not already stored in a file, it uses curl to fetch it from https://ipapi.co/country and saves it in "${tmpdir}/countrycode.txt". If curl fails, an error message is displayed.

* feat: add country code to Google Analytics tracking

This commit adds the country code parameter to the Google Analytics tracking request in the `info_stats.sh` file. It also includes various server statistics such as CPU usage, memory usage, disk usage, distro name, game name, RAM usage, server CPU details, server disk details, server RAM details, and version information.

* refactor: update country code parameter in info_stats.sh

The commit updates the country code parameter in the info_stats.sh file. The previous parameter "country" has been changed to "countryId" for better clarity and consistency.

* feat: add countryId and version to Google Analytics tracking

This commit adds the "countryId" and "version" parameters to the Google Analytics tracking in the info_stats.sh script. Now, when the script sends data to Google Analytics, it includes information about the country and version of LinuxGSM being used.

* refactor: remove unused countryId parameter in info_stats.sh

The commit removes the unused "countryId" parameter from the info_stats.sh file in the lgsm/modules directory. This change improves code cleanliness and eliminates unnecessary code.

* feat: add LinuxGSM stats tracking

This commit adds functionality to track LinuxGSM server statistics using Google Analytics and a custom API. The code now sends POST requests to both services, providing information such as CPU usage, memory usage, disk space, server hardware details, and game-specific data. Additionally, the commit includes an alert feature that sends event data to Discord if enabled.

Co-authored-by: [Author Name]

* refactor: update event name in info_stats.sh

The commit updates the event name in the info_stats.sh file from "linuxgsm" to "pageview". This change ensures that the correct event is being tracked when sending data to the stats.linuxgsm.com API.

* feat: add virtual environment to info_distro, info_game, and info_stats modules

- Added code to retrieve the virtual environment using systemd-detect-virt command.
- Updated the condition for RHEL based distros in info_distro module.
- Removed code related to country code retrieval from external IP address in info_game module.
- Added virtual environment field to the payload sent to Google Analytics and LinuxGSM API in info_stats module.

* feat: remove unnecessary header in info_stats.sh

The commit removes an unnecessary header in the info_stats.sh file. The header was causing an issue with the API request.

* feat: update server stats and enabled alerts

- Updated the server stats to include virtual environment, LinuxGSM version, and enabled alerts.
- Removed unnecessary code for sending alert statistics.

* feat: add alert options to info_stats module

This commit adds new alert options to the info_stats module. The added options include discordalert, emailalert, gotifyalert, iftttalert, mailgunalert, pushbulletalert, pushoveralert, rocketchatalert, slackalert, and telegramalert. These options allow users to configure different types of alerts for their game server statistics.

* feat: add virtual environment tracking to info_stats module

This commit adds the ability to track the virtual environment in the info_stats module. The "virtualenvironment" field is now included in the data sent to Google Analytics.

* feat: add dynamic payload generation for Google Analytics

This commit adds the ability to dynamically generate the payload for sending events to Google Analytics. The payload now includes properties such as `discordalert`, `emailalert`, `gotifyalert`, and more, based on their respective values. This allows for more flexibility in customizing the payload sent to Google Analytics.

The code changes can be found in `info_stats.sh`.

* refactor: simplify payload construction

The code changes in this commit refactor the payload construction in the `info_stats.sh` file. The changes simplify the process by removing repetitive if statements and consolidating the payload parameters. This improves readability and maintainability of the code.

* refactor: refactor alert options in info_stats.sh

Refactored the code in info_stats.sh to improve readability and maintainability. Replaced individual alert options with a unified "alert" option, which now accepts values like "discord", "email", "gotify", etc. This change simplifies the code and makes it easier to add or modify alert options in the future.

* feat: Send stats to Google Analytics GA4

This commit adds the functionality to send server statistics to Google Analytics GA4. The payload includes metrics such as CPU usage, disk usage, memory usage, and server information. The data is sent using a POST request to the Google Analytics API.

The previous code that sent stats to the LinuxGSM stats endpoint has been removed.

Note: This commit does not include any specific file changes.

* refactor: simplify sending stats to Google Analytics

The code changes refactor the logic for sending stats to Google Analytics. The previous implementation had multiple if statements for different alert types, resulting in repetitive code. The refactored code now uses a function to generate the alert payload and reduces duplication. This improves readability and maintainability of the code.

Co-authored-by: John Doe <johndoe@example.com>

---------

Co-authored-by: AI Assistant <assistant@example.com>
Co-authored-by: John Doe <johndoe@example.com>
---
 lgsm/modules/info_distro.sh |   7 +-
 lgsm/modules/info_stats.sh  | 163 ++++++++++++++++++------------------
 2 files changed, 87 insertions(+), 83 deletions(-)

diff --git a/lgsm/modules/info_distro.sh b/lgsm/modules/info_distro.sh
index 8c29a4ca2..ee84d39f2 100644
--- a/lgsm/modules/info_distro.sh
+++ b/lgsm/modules/info_distro.sh
@@ -73,7 +73,12 @@ for distro_info in "${distro_info_array[@]}"; do
 	fi
 done
 
-# some RHEL based distros use 8.4 instead of just 8.
+# Get virtual environment
+if [ "$(command -v systemd-detect-virt 2> /dev/null)" ]; then
+	virtualenvironment="$(systemd-detect-virt)"
+fi
+
+# Some RHEL based distros use 8.4 instead of just 8.
 if [[ "${distroidlike}" == *"rhel"* ]] || [ "${distroid}" == "rhel" ]; then
 	distroversioncsv="${distroversionrh}"
 else
diff --git a/lgsm/modules/info_stats.sh b/lgsm/modules/info_stats.sh
index 2afe3338d..965e3898e 100644
--- a/lgsm/modules/info_stats.sh
+++ b/lgsm/modules/info_stats.sh
@@ -56,108 +56,104 @@ cpuusedmhzroundup="$(((cpuusedmhz + 99) / 100 * 100))"
 # nearest 100MB
 memusedroundup="$(((memused + 99) / 100 * 100))"
 
-# Spliting the metrics in to 3 propertys allows more accurate metrics on numbers of invidual instances, installs and hardware.
-# Instance Property - UA-165287622-1
-# Install Property - UA-165287622-2
-# Hardware Property - UA-165287622-3
+apisecret="A-OzP02TSMWt4_vHi6ZpUw"
+measurementid="G-0CR8V7EMT5"
+
+# Sending stats to Google Analytics GA4
+payload="{
+	\"client_id\": \"${uuidinstance}\",
+	\"events\": [
+		{
+		\"name\": \"LinuxGSM\",
+		\"params\": {
+			\"cpuusedmhzroundup\": \"${cpuusedmhzroundup}MHz\",
+			\"diskused\": \"${serverfilesdu}\",
+			\"distro\": \"${distroname}\",
+			\"game\": \"${gamename}\",
+			\"memusedroundup\": \"${memusedroundup}MB\",
+			\"ramused\": \"${memusedroundup}MB\",
+			\"servercpu\": \"${cpumodel} ${cpucores} cores\",
+			\"servercpufreq\": \"${cpufreqency} x${cpucores}\",
+			\"serverdisk\": \"${totalspace}\",
+			\"serverfilesdu\": \"${serverfilesdu}\",
+			\"serverram\": \"${physmemtotal}\",
+			\"uuidhardware\": \"${uuidhardware}\",
+			\"uuidinstall\": \"${uuidinstall}\",
+			\"uuidinstance\": \"${uuidinstance}\",
+			\"version\": \"${version}\",
+			\"virtualenvironment\": \"${virtualenvironment}\"
+			}
+		}
+	]
+}"
+
+fn_alert_payload(){
+alertpayload="{
+	\"client_id\": \"${uuidinstance}\",
+	\"events\": [
+		{
+		\"name\": \"LinuxGSM\",
+		\"params\": {
+			\"alert\": \"${alerttype}\"
+			}
+		}
+	]
+}"
+}
+
+curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=A-OzP02TSMWt4_vHi6ZpUw&measurement_id=G-0CR8V7EMT5" -H "Content-Type: application/json" -d "${payload}"
 
-## Distro.
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=distro" -d "ea=${distroname}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=distro" -d "ea=${distroname}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=distro" -d "ea=${distroname}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-
-## Game Server Name.
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=game" -d "ea=${gamename}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=game" -d "ea=${gamename}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=game" -d "ea=${gamename}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-
-## LinuxGSM Version.
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=version" -d "ea=${version}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=version" -d "ea=${version}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=version" -d "ea=${version}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-
-## CPU usage of a game server.
-if [ -n "${cpuusedmhzroundup}" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=cpuused" -d "ea=${cpuusedmhzroundup}MHz" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=cpuused" -d "ea=${cpuusedmhzroundup}MHz" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=cpuused" -d "ea=${cpuusedmhzroundup}MHz" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-fi
-## Ram usage of a game server.
-if [ -n "${memusedroundup}" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=ramused" -d "ea=${memusedroundup}MB" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=ramused" -d "ea=${memusedroundup}MB" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=ramused" -d "ea=${memusedroundup}MB" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-fi
-## Disk usage of a game server.
-if [ -n "${serverfilesdu}" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=diskused" -d "ea=${serverfilesdu}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=diskused" -d "ea=${serverfilesdu}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=diskused" -d "ea=${serverfilesdu}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-fi
-
-## CPU Model.
-if [ -n "${cpumodel}" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=servercpu" -d "ea=${cpumodel} ${cpucores} cores" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=servercpu" -d "ea=${cpumodel} ${cpucores} cores" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=servercpu" -d "ea=${cpumodel} ${cpucores} cores" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-
-fi
-
-## CPU Frequency.
-if [ -n "${cpufreqency}" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=servercpufreq" -d "ea=${cpufreqency} x${cpucores}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=servercpufreq" -d "ea=${cpufreqency} x${cpucores}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=servercpufreq" -d "ea=${cpufreqency} x${cpucores}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-fi
-
-## Server RAM.
-if [ -n "${physmemtotal}" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=serverram" -d "ea=${physmemtotal}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=serverram" -d "ea=${physmemtotal}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=serverram" -d "ea=${physmemtotal}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-fi
-
-## Server Disk.
-if [ -n "${totalspace}" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=serverdisk" -d "ea=${totalspace}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=serverdisk" -d "ea=${totalspace}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=serverdisk" -d "ea=${totalspace}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-fi
-
-## Alert Stats.
 if [ "${discordalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Discord" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="discord"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${emailalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Email" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="email"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
+fi
+if [ "${gotifyalert}" == "on" ]; then
+	alerttype="gotify"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${iftttalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=IFTTT" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="ifttt"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${mailgunalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Mailgun" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="mailgun"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${pushbulletalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Pushbullet" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="pushbullet"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${pushoveralert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Pushover" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="pushover"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${rocketchatalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Rocket Chat" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="rocketchat"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${slackalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Slack" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="slack"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 if [ "${telegramalert}" == "on" ]; then
-	curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=alert" -d "ea=Telegram" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
+	alerttype="telegram"
+	fn_alert_payload
+	curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=${apisecret}&measurement_id=${measurementid}" -H "Content-Type: application/json" -d "${alertpayload}"
 fi
 
-## Summary Stats
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-1" -d "aip=1" -d "cid=${uuidinstance}" -d "t=event" -d "ec=summary" -d "ea=GAME: ${gamename} | DISTRO: ${distroname} | CPU MODEL: ${cpumodel} ${cpucores} cores | RAM: ${physmemtotal} | DISK: ${totalspace}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-2" -d "aip=1" -d "cid=${uuidinstall}" -d "t=event" -d "ec=summary" -d "ea=GAME: ${gamename} | DISTRO: ${distroname} | CPU MODEL: ${cpumodel} ${cpucores} cores | RAM: ${physmemtotal} | DISK: ${totalspace}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-curl https://www.google-analytics.com/collect -d "tid=UA-165287622-3" -d "aip=1" -d "cid=${uuidhardware}" -d "t=event" -d "ec=summary" -d "ea=GAME: ${gamename} | DISTRO: ${distroname} | CPU MODEL: ${cpumodel} ${cpucores} cores | RAM: ${physmemtotal} | DISK: ${totalspace}" -d "el=${gamename}" -d "v=1" > /dev/null 2>&1
-
 fn_script_log_info "Send LinuxGSM stats"
 fn_script_log_info "* uuid-${selfname}: ${uuidinstance}"
 fn_script_log_info "* uuid-install: ${uuidinstall}"
@@ -171,3 +167,6 @@ fn_script_log_info "* Server CPU Model: ${cpumodel}"
 fn_script_log_info "* Server CPU Frequency: ${cpufreqency}"
 fn_script_log_info "* Server RAM: ${physmemtotal}"
 fn_script_log_info "* Server Disk: ${totalspace}"
+fn_script_log_info "* Virtual Environment: ${virtualenvironment}"
+fn_script_log_info "* LinuxGSM Version: ${version}"
+fn_script_log_info "* Enabled Alerts"

From 290eb6be3a452b66f9b048fcaeab76d96cb21ad0 Mon Sep 17 00:00:00 2001
From: maximalmax90 <75565218+maximalmax90@users.noreply.github.com>
Date: Mon, 28 Aug 2023 05:03:44 +0800
Subject: [PATCH 04/33] Update update_vintagestory.sh (#4286)

* build(deps): bump github/issue-labeler from 3.1 to 3.2 (#4258)

Bumps [github/issue-labeler](https://github.com/github/issue-labeler) from 3.1 to 3.2.
- [Release notes](https://github.com/github/issue-labeler/releases)
- [Commits](https://github.com/github/issue-labeler/compare/v3.1...v3.2)

---
updated-dependencies:
- dependency-name: github/issue-labeler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update update_vintagestory.sh

* Update _default.cfg

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Daniel Gibbs <me@danielgibbs.co.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/labeler.yml                            | 2 +-
 lgsm/config-default/config-lgsm/vintsserver/_default.cfg | 6 +++---
 lgsm/modules/update_vintagestory.sh                      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index f04630831..44beca03d 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Issue Labeler
-        uses: github/issue-labeler@v3.1
+        uses: github/issue-labeler@v3.2
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           configuration-path: .github/labeler.yml
diff --git a/lgsm/config-default/config-lgsm/vintsserver/_default.cfg b/lgsm/config-default/config-lgsm/vintsserver/_default.cfg
index b6bd76831..2db6dbc06 100644
--- a/lgsm/config-default/config-lgsm/vintsserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/vintsserver/_default.cfg
@@ -9,7 +9,7 @@
 #### Game Server Settings ####
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="--datapath ${servercfgdir}"
+startparameters="--dataPath ${servercfgdir}"
 
 ## Release Settings | https://docs.linuxgsm.com/game-servers/vintagestory#release-settings
 # Branch (stable|unstable)
@@ -150,8 +150,8 @@ glibc="2.17"
 ## Game Server Directories
 systemdir="${serverfiles}"
 executabledir="${systemdir}"
-preexecutable="mono"
-executable="./VintagestoryServer.exe"
+preexecutable=""
+executable="./VintagestoryServer"
 servercfgdir="${serverfiles}/data/${selfname}"
 servercfg="serverconfig.json"
 servercfgdefault="serverconfig.json"
diff --git a/lgsm/modules/update_vintagestory.sh b/lgsm/modules/update_vintagestory.sh
index 8fbc49044..d186d19aa 100644
--- a/lgsm/modules/update_vintagestory.sh
+++ b/lgsm/modules/update_vintagestory.sh
@@ -42,9 +42,9 @@ fn_update_remotebuild() {
 	else
 		remotebuildversion=$(echo "${remotebuildresponse}" | jq -r '[ to_entries[] ] | .[].key' | grep -E "\-rc|\-pre" | sort -r -V | head -1)
 	fi
-	remotebuildfilename=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].server.filename')
-	remotebuildurl=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].server.urls.cdn')
-	remotebuildhash=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].server.md5')
+	remotebuildfilename=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].linuxserver.filename')
+	remotebuildurl=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].linuxserver.urls.cdn')
+	remotebuildhash=$(echo "${remotebuildresponse}" | jq --arg remotebuildversion "${remotebuildversion}" -r '.[$remotebuildversion].linuxserver.md5')
 
 	if [ "${firstcommandname}" != "INSTALL" ]; then
 		fn_print_dots "Checking remote build: ${remotelocation}"

From 4ddd8ee184301595dbcfe6e61c88706b6be12913 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 28 Aug 2023 01:49:47 +0100
Subject: [PATCH 05/33] feat: tmux uniqueness (#4296)

* refactor: refactor tmux session handling

- Updated the code to use the variable `socketname` instead of `sessionname` when interacting with tmux sessions.
- Added logic to create a unique socket name using a UID if it doesn't already exist.
- Refactored multiple functions (`fn_start_jk2`, `fn_start_tmux`, `fn_stop_graceful_ctrlc`, `fn_stop_graceful_cmd`, `fn_stop_graceful_goldsrc`, `fn_stop_graceful_avorion`, and `fn_stop_tmux`) to use the new socket name for tmux commands.

This commit improves the readability and maintainability of the code by separating the concept of session names from socket names, allowing for more flexibility in managing tmux sessions.

* feat: stop server when generating uid

this should prevent issues when migrating to using uid

* refactor: lockfile handling

- Removed unnecessary function fn_start_jk2()
- Removed unused variable startparameters in fn_start_tmux()
- Added comments to clarify code functionality
- Renamed lockfile from "${lockdir}/${selfname}.lock" to "${lockdir}/${selfname}-start.lock"
- Updated log messages and log file names to include timestamp

* refactor: improve backup and update monitoring

The code in `command_monitor.sh` has been refactored to enhance the monitoring of backups and updates. The conditions for checking if a backup or update is running have been modified to include additional checks using `pgrep`. This change improves the accuracy of the monitoring process.

* refactor: improve logging in core_exit.sh

- Changed the grep command to include the -a flag to handle non-text files
- Updated sed command to remove "modulefile=" from the output and redirect it to dev-debug-module-order.log

* refactor: improve code readability and remove redundant code

- Refactored the `fn_monitor_check_starting` function to check for stale lockfiles and print appropriate messages.
- Refactored the `fn_monitor_check_stopping` function to check for stale lockfiles and print appropriate messages.
- Removed redundant code that deletes the update lockfile in `command_update.sh` and `command_validate.sh`.
- Improved code readability by removing unnecessary comments.

* feat: add exitbypass flag to prevent lingering tmux sessions

The code changes in `command_start.sh` include adding an `exitbypass` flag to prevent lingering tmux sessions. This flag is used to stop the running server before creating a unique uid for the tmux socket name.

* refactor: Refactor lockfile names for consistency and clarity

- Renamed "${lockdir}/${selfname}-laststart.lock" to "${lockdir}/${selfname}-last-started.lock"
- Renamed "${lockdir}/backup.lock" to "${lockdir}/stopping.lock"
- Renamed "${lockdir}/${selfname}-start.lock" to "${lockdir}/${selfname}-started.lock"
- Renamed "${lockdir}/${selfname}-starting.lock" to "${lockdir}/${selfname}-stopping.lock"

This commit refactors the lockfile names in the codebase for better consistency and clarity. The changes make it easier to understand the purpose of each lockfile and improve readability.

* refactor: refactor check_last_update.sh, command_backup.sh, command_debug.sh, command_mods_remove.sh, command_monitor.sh, command_start.sh, command_stop.sh, command_ts3_server_pass.sh and core_steamcmd.sh

- Refactored code to improve readability and maintainability.
- Renamed variables for clarity.
- Removed unnecessary comments and unused code.
- Fixed typos and formatting issues.

* refactor: update lock file path in core_steamcmd.sh

The lock file path in the core_steamcmd.sh script has been updated to use the correct variable. This change ensures that the lock file is created in the correct directory.

* refactor: improve file deletion in command_stop.sh

The code change refactors the file deletion process in the command_stop.sh script. Instead of using an empty redirect, it now directly removes the specified lock file. This improves clarity and ensures proper cleanup when stopping a command.

* refactor: update lockfile name in command_monitor.sh

The lockfile name has been changed from "${selfname}-started.lock" to "${selfname}-monitoring.lock" in the fn_monitor_check_lockfile function. The code has also been refactored to remove unnecessary checks and fixes for the lockfile.

* refactor: simplify start and stop command checks

The code in `command_start.sh` and `command_stop.sh` has been refactored to simplify the checks for the start and stop commands. Instead of checking if `exitbypass` is empty, it now directly checks if `firstcommandname` matches specific values ("START", "RESTART" for start command, and "STOP" for stop command). This change improves readability and reduces unnecessary conditions.

* refactor: simplify lockfile names and remove duplicate code

- Renamed lockfiles from "${selfname}-started.lock" to "started.lock", "${selfname}-starting.lock" to "starting.lock", "${selfname}-stopping.lock" to "stopping.lock", and "${selfname}-update.lock" to "update.lock".
- Removed duplicate code for removing stale lockfiles in fn_monitor_check_starting(), fn_monitor_check_stopping(), fn_monitor_check_backup(), fn_monitor_check_update(), update_factorio.sh, update_jediknight2.sh, update_minecraft.sh, update_minecraft_bedrock.sh, update_mta.sh, update_papermc.sh, update_ts3.sh, update_ut99.sh, and update_vintagestory.sh.
- Updated references to the renamed lockfiles in the respective functions.

* fix: corrected commandname

* fix: commandname skeleton

* refactor: improve file path handling in check_last_update.sh

The code changes refactor the file path handling in check_last_update.sh to use the correct lock directory. This ensures that the last update time is correctly retrieved and compared with the last start time.

* feat: add update lock file

Add functionality to create an update lock file when validating and updating SteamCMD. This prevents potential conflicts with customised files.

- Create a lock file with the current timestamp in the "command_validate.sh" script
- Create a lock file with the current timestamp in the "update_steamcmd.sh" script

* refactor: rename libgcc_s.so.1 backup file

The code has been refactored to improve clarity and readability. The variable `libgccc_so` has been renamed to `libgccc_so.bak` for better understanding of its purpose. This change ensures that the backup file for libgcc_s.so.1 is correctly named and easily identifiable.

* refactor: improve logging and error handling in command_monitor.sh

- Added error handling for PIDs with identical tmux sessions running, killing them and restarting the server.
- Added error handling for PIDs with the same tmux session and socket names running, killing them and restarting the server.
---
 lgsm/modules/check_last_update.sh        |  14 +-
 lgsm/modules/check_status.sh             |   2 +-
 lgsm/modules/command_backup.sh           |  28 +++-
 lgsm/modules/command_console.sh          |   2 +-
 lgsm/modules/command_debug.sh            |  12 +-
 lgsm/modules/command_mods_remove.sh      |   2 +-
 lgsm/modules/command_monitor.sh          | 195 +++++++++++++++++------
 lgsm/modules/command_restart.sh          |   2 +-
 lgsm/modules/command_send.sh             |   2 +-
 lgsm/modules/command_skeleton.sh         |   3 +
 lgsm/modules/command_start.sh            |  99 ++++++------
 lgsm/modules/command_stop.sh             |  30 ++--
 lgsm/modules/command_ts3_server_pass.sh  |   4 +-
 lgsm/modules/command_update.sh           |   3 +
 lgsm/modules/command_validate.sh         |   5 +-
 lgsm/modules/core_exit.sh                |   2 +-
 lgsm/modules/core_steamcmd.sh            |   5 +-
 lgsm/modules/fix_csgo.sh                 |   2 +-
 lgsm/modules/fix_ts3.sh                  |  13 ++
 lgsm/modules/info_distro.sh              |   2 +-
 lgsm/modules/update_factorio.sh          |   5 +-
 lgsm/modules/update_jediknight2.sh       |   5 +-
 lgsm/modules/update_minecraft.sh         |   5 +-
 lgsm/modules/update_minecraft_bedrock.sh |   5 +-
 lgsm/modules/update_mta.sh               |   5 +-
 lgsm/modules/update_papermc.sh           |   5 +-
 lgsm/modules/update_steamcmd.sh          |   5 +-
 lgsm/modules/update_ts3.sh               |   5 +-
 lgsm/modules/update_ut99.sh              |   5 +-
 lgsm/modules/update_vintagestory.sh      |   5 +-
 linuxgsm.sh                              |   3 +-
 31 files changed, 328 insertions(+), 152 deletions(-)

diff --git a/lgsm/modules/check_last_update.sh b/lgsm/modules/check_last_update.sh
index d4f2d8f89..02d17c975 100644
--- a/lgsm/modules/check_last_update.sh
+++ b/lgsm/modules/check_last_update.sh
@@ -3,21 +3,21 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Checks lock file to see when last update happened.
+# Description: Checks Lockfile to see when last update happened.
 # Will reboot server if instance not rebooted since update.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-if [ -f "${lockdir}/${selfname}-laststart.lock" ]; then
-	laststart=$(cat "${lockdir}/${selfname}-laststart.lock")
+if [ -f "${lockdir}/${selfname}-last-started.lock" ]; then
+	laststart=$(cat "${lockdir}/${selfname}-last-started.lock")
 fi
-if [ -f "${lockdir}/lastupdate.lock" ]; then
-	lastupdate=$(cat "${lockdir}/lastupdate.lock")
+if [ -f "${lockdir}/last-updated.lock" ]; then
+	lastupdate=$(cat "${lockdir}/last-updated.lock")
 fi
 
 check_status.sh
-if [ -f "${lockdir}/lastupdate.lock" ] && [ "${status}" != "0" ]; then
-	if [ ! -f "${lockdir}/${selfname}-laststart.lock" ] || [ "${laststart}" -lt "${lastupdate}" ]; then
+if [ -f "${lockdir}/last-updated.lock" ] && [ "${status}" != "0" ]; then
+	if [ ! -f "${lockdir}/${selfname}-last-started.lock" ] || [ "${laststart}" -lt "${lastupdate}" ]; then
 		fn_print_info "${selfname} has not been restarted since last update"
 		fn_script_log_info "${selfname} has not been restarted since last update"
 		command_restart.sh
diff --git a/lgsm/modules/check_status.sh b/lgsm/modules/check_status.sh
index 6edd4151b..906675e81 100644
--- a/lgsm/modules/check_status.sh
+++ b/lgsm/modules/check_status.sh
@@ -7,4 +7,4 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-status=$(tmux -L "${sessionname}" list-sessions -F "#{session_name}" 2> /dev/null | grep -Ecx "^${sessionname}")
+status=$(tmux -L "${socketname}" list-sessions -F "#{session_name}" 2> /dev/null | grep -Ecx "^${sessionname}")
diff --git a/lgsm/modules/command_backup.sh b/lgsm/modules/command_backup.sh
index 1973eb95f..b63c82625 100644
--- a/lgsm/modules/command_backup.sh
+++ b/lgsm/modules/command_backup.sh
@@ -22,7 +22,7 @@ fn_backup_trap() {
 	echo -en "backup ${backupname}.tar.gz..."
 	fn_print_removed_eol_nl
 	fn_script_log_info "Backup ${backupname}.tar.gz: REMOVED"
-	# Remove lock file.
+	# Remove backup lockfile.
 	rm -f "${lockdir:?}/backup.lock"
 	fn_backup_start_server
 	unset exitbypass
@@ -31,9 +31,21 @@ fn_backup_trap() {
 
 # Check if a backup is pending or has been aborted using backup.lock.
 fn_backup_check_lockfile() {
+	# Remove stale lockfile.
 	if [ -f "${lockdir}/backup.lock" ]; then
-		fn_print_info_nl "Lock file found: Backup is currently running"
-		fn_script_log_error "Lock file found: Backup is currently running: ${lockdir}/backup.lock"
+		if [ "$(find "${lockdir}/backup.lock" -mmin +60)" ]; then
+			fn_print_dots "Lockfile found: "
+			fn_print_checking_eol
+			fn_print_warn "Lockfile found: Removing stale lockfile: "
+			fn_print_warn_eol
+			fn_script_log_warn "Lockfile found: Removing stale lockfile"
+			rm -f "${lockdir:?}/backup.lock"
+		fi
+	fi
+
+	if [ -f "${lockdir}/backup.lock" ]; then
+		fn_print_info_nl "Lockfile found: Backup is currently running"
+		fn_script_log_error "Lockfile found: Backup is currently running: ${lockdir}/backup.lock"
 		core_exit.sh
 	fi
 }
@@ -117,8 +129,8 @@ fn_backup_migrate_olddir() {
 
 fn_backup_create_lockfile() {
 	# Create lockfile.
-	date '+%s' > "${lockdir}/backup.lock"
-	fn_script_log_info "Lockfile generated"
+	date '+%s' > "${lockdir:?}/backup.lock"
+	fn_script_log_info "Backup lockfile generated"
 	fn_script_log_info "${lockdir}/backup.lock"
 	# trap to remove lockfile on quit.
 	trap fn_backup_trap INT
@@ -140,7 +152,7 @@ fn_backup_compression() {
 		core_exit.sh
 	fi
 
-	tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" --exclude "${lockdir}/backup.lock" ./.
+	tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "${excludedir}" --exclude "${lockdir}" ./.
 	local exitcode=$?
 	if [ "${exitcode}" != 0 ]; then
 		fn_print_fail_eol
@@ -153,8 +165,6 @@ fn_backup_compression() {
 		fn_print_ok_nl "Completed: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')"
 		fn_script_log_pass "Backup created: ${backupname}.tar.gz, total size $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}')"
 	fi
-	# Remove lock file
-	rm -f "${lockdir:?}/backup.lock"
 }
 
 # Clear old backups according to maxbackups and maxbackupdays variables.
@@ -265,4 +275,6 @@ fn_backup_compression
 fn_backup_prune
 fn_backup_start_server
 
+# Remove backup lockfile.
+rm -f "${lockdir:?}/backup.lock"
 core_exit.sh
diff --git a/lgsm/modules/command_console.sh b/lgsm/modules/command_console.sh
index 95945dbe3..a5d49d7f2 100644
--- a/lgsm/modules/command_console.sh
+++ b/lgsm/modules/command_console.sh
@@ -42,7 +42,7 @@ check_status.sh
 if [ "${status}" != "0" ]; then
 	fn_print_ok_nl "Accessing console"
 	fn_script_log_pass "Console accessed"
-	tmux -L "${sessionname}" attach-session -t "${sessionname}"
+	tmux -L "${socketname}" attach-session -t "${sessionname}"
 	fn_print_ok_nl "Closing console"
 	fn_script_log_pass "Console closed"
 else
diff --git a/lgsm/modules/command_debug.sh b/lgsm/modules/command_debug.sh
index 52efd04db..c544e3e2a 100644
--- a/lgsm/modules/command_debug.sh
+++ b/lgsm/modules/command_debug.sh
@@ -13,7 +13,7 @@ fn_firstcommand_set
 # Trap to remove lockfile on quit.
 fn_lockfile_trap() {
 	# Remove lockfile.
-	rm -f "${lockdir:?}/${selfname}.lock"
+	rm -f "${lockdir:?}/${selfname}-started.lock"
 	# resets terminal. Servers can sometimes mess up the terminal on exit.
 	reset
 	fn_print_dots "Stopping debug"
@@ -98,12 +98,12 @@ fn_print_dots "Starting debug"
 fn_script_log_info "Starting debug"
 fn_print_ok_nl "Starting debug"
 
-# Create lockfile.
-date '+%s' > "${lockdir}/${selfname}.lock"
-echo "${version}" >> "${lockdir}/${selfname}.lock"
-echo "${port}" >> "${lockdir}/${selfname}.lock"
+# Create started lockfile.
+date '+%s' > "${lockdir:?}/${selfname}-started.lock"
+echo "${version}" >> "${lockdir}/${selfname}-started.lock"
+echo "${port}" >> "${lockdir}/${selfname}-started.lock"
 fn_script_log_info "Lockfile generated"
-fn_script_log_info "${lockdir}/${selfname}.lock"
+fn_script_log_info "${lockdir}/${selfname}-started.lock"
 
 if [ "${shortname}" == "av" ]; then
 	cd "${systemdir}" || exit
diff --git a/lgsm/modules/command_mods_remove.sh b/lgsm/modules/command_mods_remove.sh
index 08095c8e8..8f9ea3739 100644
--- a/lgsm/modules/command_mods_remove.sh
+++ b/lgsm/modules/command_mods_remove.sh
@@ -131,7 +131,7 @@ fi
 if [ "${engine}" == "unity3d" ] && [[ "${modprettyname}" == *"Oxide"* ]]; then
 	fn_print_information_nl "Validating to restore original ${gamename} files replaced by Oxide"
 	fn_script_log "Validating to restore original ${gamename} files replaced by Oxide"
-	exitbypass="1"
+	exitbypass=1
 	command_validate.sh
 	fn_firstcommand_reset
 	unset exitbypass
diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh
index 5edd7298e..c64df9fda 100644
--- a/lgsm/modules/command_monitor.sh
+++ b/lgsm/modules/command_monitor.sh
@@ -11,87 +11,181 @@ commandaction="Monitoring"
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 fn_firstcommand_set
 
-fn_monitor_check_lockfile() {
+fn_monitor_check_monitoring() {
 	# Monitor does not run if lockfile is not found.
-	if [ ! -f "${lockdir}/${selfname}.lock" ]; then
+	if [ ! -f "${lockdir}/${selfname}-monitoring.lock" ]; then
 		fn_print_dots "Checking lockfile: "
 		fn_print_checking_eol
 		fn_script_log_info "Checking lockfile: CHECKING"
-		fn_monitor_check_update
-		fn_monitor_check_backup
-		fn_monitor_check_debug
 		fn_print_error "Checking lockfile: No lockfile found: "
 		fn_print_error_eol_nl
 		fn_script_log_error "Checking lockfile: No lockfile found: ERROR"
 		echo -e "* Start ${selfname} to run monitor."
 		core_exit.sh
 	fi
+}
 
-	# Fix if lockfile is not unix time or contains letters
-	if [ -f "${lockdir}/${selfname}.lock" ] && [[ "$(head -n 1 "${lockdir}/${selfname}.lock")" =~ [A-Za-z] ]]; then
-		date '+%s' > "${lockdir}/${selfname}.lock"
-		echo "${version}" >> "${lockdir}/${selfname}.lock"
-		echo "${port}" >> "${lockdir}/${selfname}.lock"
+fn_monitor_check_install() {
+	if [ "$(pgrep -fc -u "${USER}" "${selfname} install")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} i")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} auto-install")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} ai")" != "0" ]; then
+		fn_print_dots "Checking installer: "
+		fn_print_checking_eol
+		fn_script_log_info "Checking installer: CHECKING"
+		fn_print_info "Checking installer: Installer is : "
+		fn_print_info_eol
+		fn_script_log_pass "Checking installer: LinuxGSM is installing"
+		core_exit.sh
 	fi
 }
 
-fn_monitor_check_backup() {
-	# Monitor will check if backup is running.
-	if [ "$(pgrep "${selfname} backup" | wc -l)" != "0" ] || [ "$(pgrep "${selfname} b" | wc -l)" != "0" ]; then
-		fn_print_info "Checking lockfile: LinuxGSM is currently running a backup: "
+fn_monitor_check_debug() {
+	if [ "$(pgrep -fc -u "${USER}" "${selfname} debug")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} d")" != "0" ]; then
+		fn_print_dots "Checking debug: "
+		fn_print_checking_eol
+		fn_print_info "Checking debug: Debug is running: "
 		fn_print_info_eol
-		fn_script_log_info "Checking lockfile: LinuxGSM is currently running a backup"
+		fn_script_log_pass "Checking debug: Debug is running"
 		core_exit.sh
 	fi
 }
 
-fn_monitor_check_debug() {
-	# Monitor will check if backup is running.
-	if [ "$(pgrep -fc "${selfname} backup")" != "0" ] || [ "$(pgrep -fc "${selfname} b")" != "0" ]; then
-		fn_print_info "Checking lockfile: LinuxGSM is currently in debug mode: "
+fn_monitor_check_starting(){
+	# Remove stale lockfile.
+	if [ -f "${lockdir}/${selfname}-starting.lock" ]; then
+		if [ "$(find "${lockdir}/${selfname}-starting.lock" -mmin +5)" ]; then
+			fn_print_dots "Checking start: "
+			fn_print_checking_eol
+			fn_print_warn "Checking start: Removing stale lockfile: "
+			fn_print_warn_eol
+			fn_script_log_warn "Checking start: Removing stale lockfile"
+			rm -f "${lockdir:?}/${selfname}-starting.lock"
+		fi
+	fi
+
+	if [ -f "${lockdir}/${selfname}-starting.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} start")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} s")" != "0" ]]; then
+		fn_print_dots "Checking start: "
+		fn_print_checking_eol
+		fn_print_info "Checking start: LinuxGSM is starting: "
 		fn_print_info_eol
-		fn_script_log_pass "Checking lockfile: LinuxGSM is currently in debug mode"
+		fn_script_log_info "Checking backup: LinuxGSM is starting"
 		core_exit.sh
 	fi
 }
 
-fn_monitor_check_install() {
-	# Monitor will check if update is running.
-	if [ "$(pgrep -fc "${selfname} install")" != "0" ] || [ "$(pgrep -fc "${selfname} i")" != "0" ] || [ "$(pgrep -fc "${selfname} auto-install")" != "0" ] || [ "$(pgrep -fc "${selfname} ai")" != "0" ]; then
-		fn_print_dots "Checking for installer: "
+fn_monitor_check_stopping(){
+	# Remove stale lockfile.
+	if [ -f "${lockdir}/${selfname}-stopping.lock" ]; then
+		if [ "$(find "${lockdir}/${selfname}-stopping.lock" -mmin +5)" ]; then
+			fn_print_dots "Checking stop: "
+			fn_print_checking_eol
+			fn_print_warn "Checking stop: Removing stale lockfile: "
+			fn_print_warn_eol
+			fn_script_log_warn "Checking stop: Removing stale lockfile"
+			rm -f "${lockdir:?}/${selfname}-stopping.lock"
+		fi
+	fi
+
+	if [ -f "${lockdir}/${selfname}-stopping.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} stop")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} s")" != "0" ]]; then
+		fn_print_dots "Checking stop: "
 		fn_print_checking_eol
-		fn_script_log_info "Checking for installer: CHECKING"
-		fn_print_info "Checking for installer: LinuxGSM is currently installing: "
+		fn_print_info "Checking stop: LinuxGSM is stopping: "
 		fn_print_info_eol
-		fn_script_log_pass "Checking for installer: LinuxGSM is currently installing"
+		fn_script_log_info "Checking backup: LinuxGSM is stopping"
 		core_exit.sh
 	fi
 }
 
-fn_monitor_check_update() {
-	# Specific check for docker. Will ignore the command watch -n 1800 ./csgoserver update
-	monitorps=0
-	if [ "$(pgrep -fc "n*${selfname} update")" != "0" ]; then
-		monitorps="$((monitorps - 1))"
+fn_monitor_check_backup() {
+	# Remove stale lockfile.
+	if [ -f "${lockdir}/backup.lock" ]; then
+		if [ "$(find "${lockdir}/backup.lock" -mmin +60)" ]; then
+			fn_print_dots "Checking backup: "
+			fn_print_checking_eol
+			fn_print_warn "Checking backup: Removing stale lockfile: "
+			fn_print_warn_eol
+			fn_script_log_warn "Checking backup: Removing stale lockfile"
+			rm -f "${lockdir:?}/backup.lock"
+		fi
+	fi
+
+	if [ -f "${lockdir}/backup.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} backup")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} b")" != "0" ]]; then
+		fn_print_dots "Checking backup: "
+		fn_print_checking_eol
+		fn_print_info "Checking backup: Backup is running: "
+		fn_print_info_eol
+		fn_script_log_info "Checking backup: Backup is running"
+		core_exit.sh
 	fi
-	# Monitor will check if an update is running.
-	if [ "$(pgrep -fc "${selfname} update")" != "0" ] || [ "$(pgrep -fc "${selfname} u")" != "0" ] || [ "$(pgrep -fc "${selfname} validate")" != "0" ] || [ "$(pgrep -fc "${selfname} v")" != "0" ]; then
-		monitorps="$((monitorps + 2))"
-		if [ "${monitorps}" != "0" ]; then
-			fn_print_info_nl "Checking lockfile: LinuxGSM is currently updating: "
-			fn_print_info_eol
-			fn_script_log_pass "Checking lockfile: LinuxGSM is currently updating"
-			core_exit.sh
+}
+
+fn_monitor_check_update() {
+	# Remove stale lockfile.
+	if [ -f "${lockdir}/update.lock" ]; then
+		if [ "$(find "${lockdir}/update.lock" -mmin +15)" ]; then
+			fn_print_dots "Checking update: "
+			fn_print_checking_eol
+			fn_print_warn "Checking update: Removing stale lockfile: "
+			fn_print_warn_eol
+			fn_script_log_warn "Checking update: Removing stale lockfile"
+			rm -f "${lockdir:?}/update.lock"
 		fi
 	fi
+
+	if [ -f "${lockdir}/update.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} update")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} validate")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} v")" != "0" || "$(pgrep -fc force-update "${USER}" "${selfname} fu")" != "0" ]]; then
+		fn_print_dots "Checking update: "
+		fn_print_checking_eol
+		fn_print_info "Checking update: LinuxGSM is updating the game server: "
+		fn_print_info_eol
+		fn_script_log_pass "Checking update: LinuxGSM is updating the game server"
+		core_exit.sh
+	fi
+}
+
+# Source engine games may display a messages to indicate the server needs restarting.
+fn_monitor_check_update_source(){
+ if [ -f "${consolelogdir}/${selfname}-console.log" ] && [ "${engine}" == "source" ]; then
+	 if grep -q "Your server needs to be restarted in order to receive the latest update." "${consolelogdir}/${selfname}-console.log"; then
+		 fn_print_dots "Checking update: "
+		 fn_print_checking_eol
+		 fn_script_log_info "Checking update: CHECKING"
+		 fn_print_ok "Checking update: "
+		 fn_print_ok_eol_nl
+		 fn_script_log_info "Checking update: Monitor is restarting ${selfname} to apply update"
+		 alert="restart"
+		 alert.sh
+		 command_restart.sh
+		 core_exit.sh
+	 fi
+ fi
 }
 
 fn_monitor_check_session() {
 	fn_print_dots "Checking session: "
 	fn_print_checking_eol
 	fn_script_log_info "Checking session: CHECKING"
-	# uses status var from check_status.sh
-	if [ "${status}" != "0" ]; then
+	# Tmux session width and height needs to be reviewed as may no longer be required.
+	sessionwidth="80"
+	sessionheight="23"
+	# Check for PIDS with identical tmux sessions running.
+	if [ "$(pgrep -fc "tmux -L ${socketname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" -ge "2" ]; then
+		fn_print_error "Checking session: "
+		fn_print_error_eol_nl
+		fn_script_log_error "Checking session: ERROR"
+		fn_script_log_error "Checking session: There are PIDS with identical tmux sessions running"
+		fn_script_log_error "Checking session: Killing all tmux sessions with the socketname name ${socketname} and session name ${sessionname}"
+		pkill -f "tmux -L ${socketname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
+		command_restart.sh
+		core_exit.sh
+	# Check for tmux pids with the same tmux session and socket names. This will reduce issues with migration to release v23.5.0. #4296
+	elif [ "$(pgrep -fc -u "${USER}" "tmux -L ${sessionname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" != "0" ]; then
+		fn_print_error "Checking session: "
+		fn_print_error_eol_nl
+		fn_script_log_error "Checking session: ERROR"
+		fn_script_log_error "Checking session: PIDS with the same tmux session and socket names are running"
+		fn_script_log_error "Checking session: Killing session with the socketname name ${sessionname} and session name ${sessionname}"
+		pkill -f "tmux -L ${sessionname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
+		command_restart.sh
+		core_exit.sh
+	elif [ "${status}" != "0" ]; then
 		fn_print_ok "Checking session: "
 		fn_print_ok_eol_nl
 		fn_script_log_pass "Checking session: OK"
@@ -107,8 +201,8 @@ fn_monitor_check_session() {
 	fi
 }
 
+# Monitor will check queryport is set before continuing.
 fn_monitor_check_queryport() {
-	# Monitor will check queryport is set before continuing.
 	if [ -z "${queryport}" ] || [ "${queryport}" == "0" ]; then
 		fn_print_dots "Checking port: "
 		fn_print_checking_eol
@@ -133,7 +227,7 @@ fn_query_gsquery() {
 }
 
 fn_query_tcp() {
-	bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}'' > /dev/null 2>&1
+	bash -c "exec 3<> /dev/tcp/'${queryip}'/'${queryport}'" > /dev/null 2>&1
 	querystatus="$?"
 }
 
@@ -147,12 +241,12 @@ fn_monitor_query() {
 			fn_print_querying_eol
 			fn_script_log_info "Querying port: ${querymethod}: ${queryip}:${queryport} : ${queryattempt} : QUERYING"
 			# querydelay
-			if [ "$(head -n 1 "${lockdir}/${selfname}.lock")" -gt "$(date "+%s" -d "${querydelay} mins ago")" ]; then
+			if [ "$(head -n 1 "${lockdir}/${selfname}-started.lock")" -gt "$(date "+%s" -d "${querydelay} mins ago")" ]; then
 				fn_print_ok "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt}: "
 				fn_print_delay_eol_nl
 				fn_script_log_info "Querying port: ${querymethod}: ${ip}:${queryport} : ${queryattempt} : DELAY"
 				fn_script_log_info "Query bypassed: ${gameservername} started less than ${querydelay} minutes ago"
-				fn_script_log_info "Server started: $(date -d @$(head -n 1 "${lockdir}/${selfname}.lock"))"
+				fn_script_log_info "Server started: $(date -d "@$(head -n 1 "${lockdir}/${selfname}-started.lock")")"
 				fn_script_log_info "Current time: $(date)"
 				monitorpass=1
 				core_exit.sh
@@ -271,8 +365,15 @@ core_logs.sh
 info_game.sh
 
 # query pre-checks
-fn_monitor_check_lockfile
+fn_monitor_check_update_source
+fn_monitor_check_update
+fn_monitor_check_backup
+fn_monitor_check_debug
+fn_monitor_check_monitoring
+fn_monitor_check_starting
+fn_monitor_check_stopping
 fn_monitor_check_session
+
 # Monitor will not continue if session only check.
 if [ "${querymode}" != "1" ]; then
 	fn_monitor_check_queryport
diff --git a/lgsm/modules/command_restart.sh b/lgsm/modules/command_restart.sh
index b7bb1f3e3..ed60a5555 100644
--- a/lgsm/modules/command_restart.sh
+++ b/lgsm/modules/command_restart.sh
@@ -5,7 +5,7 @@
 # Website: https://linuxgsm.com
 # Description: Restarts the server.
 
-commandname="MODS-INSTALL"
+commandname="RESTART"
 commandaction="Restarting"
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 fn_firstcommand_set
diff --git a/lgsm/modules/command_send.sh b/lgsm/modules/command_send.sh
index 9f7c20dbb..e3dafd693 100644
--- a/lgsm/modules/command_send.sh
+++ b/lgsm/modules/command_send.sh
@@ -26,7 +26,7 @@ if [ "${status}" != "0" ]; then
 	fi
 	echo ""
 	fn_print_dots "Sending command to console: \"${commandtosend}\""
-	tmux -L "${sessionname}" send-keys -t "${servicename}" "${commandtosend}" ENTER
+	tmux -L "${socketname}" send-keys -t "${servicename}" "${commandtosend}" ENTER
 	fn_print_ok_nl "Sending command to console: \"${commandtosend}\""
 	fn_script_log_pass "Command \"${commandtosend}\" sent to console"
 else
diff --git a/lgsm/modules/command_skeleton.sh b/lgsm/modules/command_skeleton.sh
index 01a7f4e7e..9e7c19a6a 100644
--- a/lgsm/modules/command_skeleton.sh
+++ b/lgsm/modules/command_skeleton.sh
@@ -5,7 +5,10 @@
 # Website: https://linuxgsm.com
 # Description: Creates an copy of a game servers directorys.
 
+commandname="SKELETON"
+commandaction="Skeleton"
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+fn_firstcommand_set
 
 fn_print_dots "Creating skeleton directory"
 check.sh
diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh
index b9f8fa51c..1302d0d99 100644
--- a/lgsm/modules/command_start.sh
+++ b/lgsm/modules/command_start.sh
@@ -11,39 +11,14 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 addtimestamp="gawk '{ print strftime(\\\"[$logtimestampformat]\\\"), \\\$0 }'"
 fn_firstcommand_set
 
-fn_start_teamspeak3() {
-	if [ ! -f "${servercfgfullpath}" ]; then
-		fn_print_warn_nl "${servercfgfullpath} is missing"
-		fn_script_log_warn "${servercfgfullpath} is missing"
-		echo "	* Creating blank ${servercfg}"
-		fn_script_log_info "Creating blank ${servercfg}"
-		fn_sleep_time
-		echo "	* ${servercfg} can remain blank by default."
-		fn_script_log_info "${servercfgfullpath} can remain blank by default."
-		fn_sleep_time
-		echo "	* ${servercfg} is located in ${servercfgfullpath}."
-		fn_script_log_info "${servercfg} is located in ${servercfgfullpath}."
-		sleep 5
-		touch "${servercfgfullpath}"
-	fi
-	# Accept license.
-	if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then
-		install_eula.sh
-	fi
-	fn_start_tmux
-}
-
 # This will allow the Jedi Knight 2 version to be printed in console on start.
 # Used to allow update to detect JK2MV server version.
 fn_start_jk2() {
 	fn_start_tmux
-	tmux -L "${sessionname}" end -t "${sessionname}" version ENTER > /dev/null 2>&1
+	tmux -L "${socketname}" end -t "${sessionname}" version ENTER > /dev/null 2>&1
 }
 
 fn_start_tmux() {
-	if [ "${parmsbypass}" ]; then
-		startparameters=""
-	fi
 	# check for tmux size variables.
 	if [[ "${servercfgtmuxwidth}" =~ ^[0-9]+$ ]]; then
 		sessionwidth="${servercfgtmuxwidth}"
@@ -68,35 +43,41 @@ fn_start_tmux() {
 		mv "${consolelog}" "${consolelogdate}"
 	fi
 
-	# Create lockfile
-	date '+%s' > "${lockdir}/${selfname}.lock"
-	echo "${version}" >> "${lockdir}/${selfname}.lock"
-	echo "${port}" >> "${lockdir}/${selfname}.lock"
+	# Create a starting lockfile that only exists while the start command is running.
+	date '+%s' > "${lockdir:?}/${selfname}-starting.lock"
+
 	fn_reload_startparameters
 
+	# Create uid to ensure unique tmux socket name.
+	if [ ! -f "${datadir}/${selfname}.uid" ]; then
+		# stop running server (if running) to prevent lingering tmux sessions.
+		exitbypass=1
+		command_stop.sh
+		uid=$(date '+%s' | sha1sum | head -c 8)
+		echo "${uid}" > "${datadir}/${selfname}.uid"
+		socketname="${sessionname}-$(cat "${datadir}/${selfname}.uid")"
+	fi
+
 	if [ "${shortname}" == "av" ]; then
 		cd "${systemdir}" || exit
 	else
 		cd "${executabledir}" || exit
 	fi
 
-	tmux -L "${sessionname}" new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
+	tmux -L "${socketname}" new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
 
 	# Create logfile.
 	touch "${consolelog}"
 
-	# Create last start lock file
-	date +%s > "${lockdir}/${selfname}-laststart.lock"
-
 	# tmux compiled from source will return "master", therefore ignore it.
 	if [ "${tmuxv}" == "master" ]; then
 		fn_script_log "tmux version: master (user compiled)"
 		echo -e "tmux version: master (user compiled)" >> "${consolelog}"
 		if [ "${consolelogging}" == "on" ] || [ -z "${consolelogging}" ]; then
-			if [ "$logtimestamp" == "on" ]; then
-				tmux -L "${sessionname}" pipe-pane -o -t "${sessionname}" "exec bash -c \"cat | $addtimestamp\" >> '${consolelog}'"
+			if [ "${logtimestamp}" == "on" ]; then
+				tmux -L "${socketname}" pipe-pane -o -t "${sessionname}" "exec bash -c \"cat | $addtimestamp\" >> '${consolelog}'"
 			else
-				tmux -L "${sessionname}" pipe-pane -o -t "${sessionname}" "exec cat >> '${consolelog}'"
+				tmux -L "${socketname}" pipe-pane -o -t "${sessionname}" "exec cat >> '${consolelog}'"
 			fi
 		fi
 
@@ -114,10 +95,10 @@ fn_start_tmux() {
 			Currently installed: $(tmux -V)" > "${consolelog}"
 		# Console logging enable or not set.
 		elif [ "${consolelogging}" == "on" ] || [ -z "${consolelogging}" ]; then
-			if [ "$logtimestamp" == "on" ]; then
-				tmux -L "${sessionname}" pipe-pane -o -t "${sessionname}" "exec bash -c \"cat | $addtimestamp\" >> '${consolelog}'"
+			if [ "${logtimestamp}" == "on" ]; then
+				tmux -L "${socketname}" pipe-pane -o -t "${sessionname}" "exec bash -c \"cat | $addtimestamp\" >> '${consolelog}'"
 			else
-				tmux -L "${sessionname}" pipe-pane -o -t "${sessionname}" "exec cat >> '${consolelog}'"
+				tmux -L "${socketname}" pipe-pane -o -t "${sessionname}" "exec cat >> '${consolelog}'"
 			fi
 		fi
 	else
@@ -127,7 +108,7 @@ fn_start_tmux() {
 
 	# Console logging disabled.
 	if [ "${consolelogging}" == "off" ]; then
-		echo -e "Console logging disabled by user" >> "${consolelog}"
+		echo -e "Console logging disabled in settings" >> "${consolelog}"
 		fn_script_log_info "Console logging disabled by user"
 	fi
 	fn_sleep_time
@@ -176,8 +157,20 @@ fn_start_tmux() {
 				fi
 			fi
 		fi
+		# Remove starting lockfile when command ends.
+		rm -f "${lockdir:?}/${selfname}-starting.lock"
 		core_exit.sh
 	else
+		# Create start lockfile that exists only when the server is running.
+		date '+%s' > "${lockdir:?}/${selfname}-started.lock"
+		echo "${version}" >> "${lockdir}/${selfname}-started.lock"
+		echo "${port}" >> "${lockdir}/${selfname}-started.lock"
+		fn_print_ok "${servername}"
+		fn_script_log_pass "Started ${servername}"
+
+		# Create last started Lockfile.
+		date +%s > "${lockdir}/${selfname}-last-started.lock"
+
 		fn_print_ok "${servername}"
 		fn_script_log_pass "Started ${servername}"
 	fi
@@ -187,23 +180,28 @@ fn_start_tmux() {
 
 check.sh
 
-# Is the server already started.
-# $status comes from check_status.sh, which is run by check.sh for this command
+# If user ran the start command monitor will become enabled.
+if [ "${firstcommandname}" == "START" ]||[ "${firstcommandname}" == "RESTART" ]; then
+	date '+%s' > "${lockdir:?}/${selfname}-monitoring.lock"
+fi
+
+# If the server already started dont start again.
 if [ "${status}" != "0" ]; then
 	fn_print_dots "${servername}"
 	fn_print_info_nl "${servername} is already running"
 	fn_script_log_error "${servername} is already running"
 	if [ -z "${exitbypass}" ]; then
+		# Remove starting lockfile when command ends.
+		rm -f "${lockdir:?}/${selfname}-starting.lock"
 		core_exit.sh
 	fi
 fi
-if [ -z "${fixbypass}" ]; then
-	fix.sh
-fi
+
+fix.sh
 info_game.sh
 core_logs.sh
 
-# Will check for updates is updateonstart is yes.
+# Will check for updates if updateonstart is yes.
 if [ "${updateonstart}" == "yes" ] || [ "${updateonstart}" == "1" ] || [ "${updateonstart}" == "on" ]; then
 	exitbypass=1
 	unset updateonstart
@@ -212,13 +210,12 @@ if [ "${updateonstart}" == "yes" ] || [ "${updateonstart}" == "1" ] || [ "${upda
 fi
 
 fn_print_dots "${servername}"
-
-if [ "${shortname}" == "ts3" ]; then
-	fn_start_teamspeak3
-elif [ "${shortname}" == "jk2" ]; then
+if [ "${shortname}" == "jk2" ]; then
 	fn_start_jk2
 else
 	fn_start_tmux
 fi
 
+# Remove starting lockfile when command ends.
+rm -f "${lockdir:?}/${selfname}-starting.lock"
 core_exit.sh
diff --git a/lgsm/modules/command_stop.sh b/lgsm/modules/command_stop.sh
index a0cc18076..dc716216f 100644
--- a/lgsm/modules/command_stop.sh
+++ b/lgsm/modules/command_stop.sh
@@ -15,7 +15,7 @@ fn_stop_graceful_ctrlc() {
 	fn_print_dots "Graceful: CTRL+c"
 	fn_script_log_info "Graceful: CTRL+c"
 	# Sends quit.
-	tmux -L "${sessionname}" send-keys -t "${sessionname}" C-c > /dev/null 2>&1
+	tmux -L "${socketname}" send-keys -t "${sessionname}" C-c > /dev/null 2>&1
 	# Waits up to 30 seconds giving the server time to shutdown gracefuly.
 	for seconds in {1..30}; do
 		check_status.sh
@@ -43,7 +43,7 @@ fn_stop_graceful_cmd() {
 	fn_print_dots "Graceful: sending \"${1}\""
 	fn_script_log_info "Graceful: sending \"${1}\""
 	# Sends specific stop command.
-	tmux -L "${sessionname}" send -t "${sessionname}" ENTER "${1}" ENTER > /dev/null 2>&1
+	tmux -L "${socketname}" send -t "${sessionname}" ENTER "${1}" ENTER > /dev/null 2>&1
 	# Waits up to ${seconds} seconds giving the server time to shutdown gracefully.
 	for ((seconds = 1; seconds <= ${2}; seconds++)); do
 		check_status.sh
@@ -71,7 +71,7 @@ fn_stop_graceful_goldsrc() {
 	fn_print_dots "Graceful: sending \"quit\""
 	fn_script_log_info "Graceful: sending \"quit\""
 	# sends quit
-	tmux -L "${sessionname}" send -t "${sessionname}" quit ENTER > /dev/null 2>&1
+	tmux -L "${socketname}" send -t "${sessionname}" quit ENTER > /dev/null 2>&1
 	# Waits 3 seconds as goldsrc servers restart with the quit command.
 	for seconds in {1..3}; do
 		sleep 1
@@ -184,10 +184,10 @@ fn_stop_graceful_avorion() {
 	fn_print_dots "Graceful: /save /stop"
 	fn_script_log_info "Graceful: /save /stop"
 	# Sends /save.
-	tmux -L "${sessionname}" send-keys -t "${sessionname}" /save ENTER > /dev/null 2>&1
+	tmux -L "${socketname}" send-keys -t "${sessionname}" /save ENTER > /dev/null 2>&1
 	sleep 5
 	# Sends /quit.
-	tmux -L "${sessionname}" send-keys -t "${sessionname}" /stop ENTER > /dev/null 2>&1
+	tmux -L "${socketname}" send-keys -t "${sessionname}" /stop ENTER > /dev/null 2>&1
 	# Waits up to 30 seconds giving the server time to shutdown gracefuly.
 	for seconds in {1..30}; do
 		check_status.sh
@@ -240,7 +240,7 @@ fn_stop_tmux() {
 	fn_print_dots "${servername}"
 	fn_script_log_info "tmux kill-session: ${sessionname}: ${servername}"
 	# Kill tmux session.
-	tmux -L "${sessionname}" kill-session -t "${sessionname}" > /dev/null 2>&1
+	tmux -L "${socketname}" kill-session -t "${sessionname}" > /dev/null 2>&1
 	sleep 0.5
 	check_status.sh
 	if [ "${status}" == "0" ]; then
@@ -269,15 +269,27 @@ fn_stop_pre_check() {
 }
 
 check.sh
+
+# Create a stopping lockfile that only exists while the stop command is running.
+date '+%s' > "${lockdir:?}/${selfname}-stopping.lock"
+
 fn_print_dots "${servername}"
 
 info_game.sh
 fn_stop_pre_check
-# Remove lockfile.
-if [ -f "${lockdir}/${selfname}.lock" ]; then
-	rm -f "${lockdir:?}/${selfname}.lock"
+
+# Remove started lockfile.
+rm -f "${lockdir:?}/${selfname}-started.lock"
+
+# If user ran the stop command monitor will become disabled.
+if [ "${firstcommandname}" == "STOP" ];then
+	rm -f "${lockdir:?}/${selfname}-monitoring.lock"
 fi
 
+
+# Remove stopping lockfile.
+rm -f "${lockdir:?}/${selfname}-stopping.lock"
+
 if [ -z "${exitbypass}" ]; then
 	core_exit.sh
 fi
diff --git a/lgsm/modules/command_ts3_server_pass.sh b/lgsm/modules/command_ts3_server_pass.sh
index 4814ab142..0223a877c 100644
--- a/lgsm/modules/command_ts3_server_pass.sh
+++ b/lgsm/modules/command_ts3_server_pass.sh
@@ -28,7 +28,7 @@ fn_serveradmin_password_prompt() {
 fn_serveradmin_password_set() {
 	# Start server in "new password mode".
 	ts3serverpass="1"
-	exitbypass="1"
+	exitbypass=1
 	command_start.sh
 	fn_firstcommand_reset
 	fn_print_ok_nl "New password applied"
@@ -40,7 +40,7 @@ check.sh
 fn_serveradmin_password_prompt
 if [ "${status}" != "0" ]; then
 	# Stop any running server.
-	exitbypass="1"
+	exitbypass=1
 	command_stop.sh
 	fn_firstcommand_reset
 	fn_serveradmin_password_set
diff --git a/lgsm/modules/command_update.sh b/lgsm/modules/command_update.sh
index 5993609c0..62221d5e6 100644
--- a/lgsm/modules/command_update.sh
+++ b/lgsm/modules/command_update.sh
@@ -37,4 +37,7 @@ else
 	update_steamcmd.sh
 fi
 
+# remove update lockfile.
+rm -f "${lockdir:?}/update.lock"
+
 core_exit.sh
diff --git a/lgsm/modules/command_validate.sh b/lgsm/modules/command_validate.sh
index 23ee92a26..f4a6250f3 100644
--- a/lgsm/modules/command_validate.sh
+++ b/lgsm/modules/command_validate.sh
@@ -23,7 +23,7 @@ fn_validate() {
 		fi
 	done
 	fn_print_warn_nl "Validate might overwrite some customised files"
-
+	date '+%s' > "${lockdir:?}/update.lock"
 	fn_dl_steamcmd
 }
 
@@ -46,4 +46,7 @@ else
 	fn_validate
 fi
 
+# remove update lockfile
+rm -f "${lockdir:?}/update.lock"
+
 core_exit.sh
diff --git a/lgsm/modules/core_exit.sh b/lgsm/modules/core_exit.sh
index d43f0555a..a66744b19 100644
--- a/lgsm/modules/core_exit.sh
+++ b/lgsm/modules/core_exit.sh
@@ -12,7 +12,7 @@ fn_exit_dev_debug() {
 		echo -e ""
 		echo -e "${moduleselfname} exiting with code: ${exitcode}"
 		if [ -f "${rootdir}/dev-debug.log" ]; then
-			grep "modulefile=" "${rootdir}/dev-debug.log" | sed 's/modulefile=//g' > "${rootdir}/dev-debug-module-order.log"
+			grep -a "modulefile=" "${rootdir}/dev-debug.log" | sed 's/modulefile=//g' > "${rootdir}/dev-debug-module-order.log"
 		fi
 	fi
 }
diff --git a/lgsm/modules/core_steamcmd.sh b/lgsm/modules/core_steamcmd.sh
index 02074620d..54de61b7c 100644
--- a/lgsm/modules/core_steamcmd.sh
+++ b/lgsm/modules/core_steamcmd.sh
@@ -204,7 +204,10 @@ fn_update_steamcmd_remotebuild() {
 
 fn_update_steamcmd_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -248,7 +251,7 @@ fn_update_steamcmd_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir:?}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/fix_csgo.sh b/lgsm/modules/fix_csgo.sh
index eb8cc9560..01b02c4e0 100644
--- a/lgsm/modules/fix_csgo.sh
+++ b/lgsm/modules/fix_csgo.sh
@@ -37,6 +37,6 @@ libgccc_so="${serverfiles}/bin/libgcc_s.so.1"
 if [ -f "${libgccc_so}" ]; then
 	fixname="libgcc_s.so.1 move away"
 	fn_fix_msg_start
-	mv -v "${libgccc_so}" "${libgccc_so}.bck"
+	mv "${libgccc_so}" "${libgccc_so}.bak"
 	fn_fix_msg_end
 fi
diff --git a/lgsm/modules/fix_ts3.sh b/lgsm/modules/fix_ts3.sh
index 9eb728f48..3d0a6760f 100644
--- a/lgsm/modules/fix_ts3.sh
+++ b/lgsm/modules/fix_ts3.sh
@@ -7,6 +7,19 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
+# Creates a blank ts3server.ini if it does not exist.
+if [ ! -f "${servercfgfullpath}" ]; then
+	fixname="create blank ${servercfg}"
+	fn_fix_msg_start
+	touch "${servercfgfullpath}"
+	fn_fix_msg_end
+fi
+
+# Accept license.
+if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then
+	install_eula.sh
+fi
+
 # Fixes: makes libmariadb2 available #1924.
 if [ ! -f "${serverfiles}/libmariadb.so.2" ]; then
 	fixname="libmariadb.so.2"
diff --git a/lgsm/modules/info_distro.sh b/lgsm/modules/info_distro.sh
index ee84d39f2..b375f8c02 100644
--- a/lgsm/modules/info_distro.sh
+++ b/lgsm/modules/info_distro.sh
@@ -10,7 +10,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 ### Game Server pid
 if [ "${status}" == "1" ]; then
-	gameserverpid="$(tmux -L "${sessionname}" list-sessions -F "#{session_name} #{pane_pid}" | grep "^${sessionname} " | awk '{print $NF}')"
+	gameserverpid="$(tmux -L "${socketname}" list-sessions -F "#{session_name} #{pane_pid}" | grep "^${sessionname} " | awk '{print $NF}')"
 	if [ "${engine}" == "source" ]; then
 		srcdslinuxpid="$(ps -ef | grep -v grep | grep "${gameserverpid}" | grep srcds_linux | awk '{print $2}')"
 	elif [ "${engine}" == "goldsrc" ]; then
diff --git a/lgsm/modules/update_factorio.sh b/lgsm/modules/update_factorio.sh
index 2af9916aa..f7fb06c7d 100644
--- a/lgsm/modules/update_factorio.sh
+++ b/lgsm/modules/update_factorio.sh
@@ -64,7 +64,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -117,7 +120,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_jediknight2.sh b/lgsm/modules/update_jediknight2.sh
index d455a2722..e67b0c02b 100644
--- a/lgsm/modules/update_jediknight2.sh
+++ b/lgsm/modules/update_jediknight2.sh
@@ -61,7 +61,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -114,7 +117,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_minecraft.sh b/lgsm/modules/update_minecraft.sh
index e764e846e..cfdf7e057 100644
--- a/lgsm/modules/update_minecraft.sh
+++ b/lgsm/modules/update_minecraft.sh
@@ -75,7 +75,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -128,7 +131,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_minecraft_bedrock.sh b/lgsm/modules/update_minecraft_bedrock.sh
index 3c3885a9d..92bffca31 100644
--- a/lgsm/modules/update_minecraft_bedrock.sh
+++ b/lgsm/modules/update_minecraft_bedrock.sh
@@ -80,7 +80,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -133,7 +136,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_mta.sh b/lgsm/modules/update_mta.sh
index 16b8278c7..eab77c748 100644
--- a/lgsm/modules/update_mta.sh
+++ b/lgsm/modules/update_mta.sh
@@ -59,7 +59,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		if [ "${forceupdate}" == "1" ]; then
 			# forceupdate bypasses checks, useful for small build changes
 			mtaupdatestatus="forced"
@@ -118,7 +121,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_papermc.sh b/lgsm/modules/update_papermc.sh
index b70a2d69d..2438c2d86 100644
--- a/lgsm/modules/update_papermc.sh
+++ b/lgsm/modules/update_papermc.sh
@@ -85,7 +85,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -138,7 +141,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_steamcmd.sh b/lgsm/modules/update_steamcmd.sh
index 401da43a8..20a85ab93 100644
--- a/lgsm/modules/update_steamcmd.sh
+++ b/lgsm/modules/update_steamcmd.sh
@@ -23,14 +23,15 @@ if [ "${forceupdate}" == "1" ]; then
 		exitbypass=1
 		command_stop.sh
 		fn_firstcommand_reset
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_dl_steamcmd
-		date +%s > "${lockdir}/lastupdate.lock"
+		date +%s > "${lockdir}/last-updated.lock"
 		exitbypass=1
 		command_start.sh
 		fn_firstcommand_reset
 	else
 		fn_dl_steamcmd
-		date +%s > "${lockdir}/lastupdate.lock"
+		date +%s > "${lockdir}/last-updated.lock"
 	fi
 else
 	fn_update_steamcmd_localbuild
diff --git a/lgsm/modules/update_ts3.sh b/lgsm/modules/update_ts3.sh
index 30dc9e513..b031d2b34 100644
--- a/lgsm/modules/update_ts3.sh
+++ b/lgsm/modules/update_ts3.sh
@@ -68,7 +68,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -121,7 +124,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_ut99.sh b/lgsm/modules/update_ut99.sh
index 909286196..1ff84a060 100644
--- a/lgsm/modules/update_ut99.sh
+++ b/lgsm/modules/update_ut99.sh
@@ -62,7 +62,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -115,7 +118,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/lgsm/modules/update_vintagestory.sh b/lgsm/modules/update_vintagestory.sh
index d186d19aa..21e2d0e63 100644
--- a/lgsm/modules/update_vintagestory.sh
+++ b/lgsm/modules/update_vintagestory.sh
@@ -69,7 +69,10 @@ fn_update_remotebuild() {
 
 fn_update_compare() {
 	fn_print_dots "Checking for update: ${remotelocation}"
+	# Update has been found or force update.
 	if [ "${localbuild}" != "${remotebuildversion}" ] || [ "${forceupdate}" == "1" ]; then
+		# Create update lockfile.
+		date '+%s' > "${lockdir:?}/update.lock"
 		fn_print_ok_nl "Checking for update: ${remotelocation}"
 		echo -en "\n"
 		echo -e "Update available"
@@ -122,7 +125,7 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/lastupdate.lock"
+			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 52d12faca..331a61822 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -26,7 +26,6 @@ gameservername="core"
 commandname="CORE"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
-sessionname=$(echo "${selfname}" | cut -f1 -d".")
 lgsmdir="${rootdir}/lgsm"
 [ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
 lgsmlogdir="${logdir}/lgsm"
@@ -36,6 +35,8 @@ modulesdir="${lgsmdir}/modules"
 tmpdir="${lgsmdir}/tmp"
 datadir="${lgsmdir}/data"
 lockdir="${lgsmdir}/lock"
+sessionname="${selfname}"
+[ -f "${datadir}/${selfname}.uid" ] && socketname="${sessionname}-$(cat "${datadir}/${selfname}.uid")" || socketname="${sessionname}"
 serverlist="${datadir}/serverlist.csv"
 serverlistmenu="${datadir}/serverlistmenu.csv"
 [ -n "${LGSM_CONFIG}" ] && configdir="${LGSM_CONFIG}" || configdir="${lgsmdir}/config-lgsm"

From 2d6092186c51aef573d9a608e65d2da0a406ae7f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 28 Aug 2023 22:21:18 +0100
Subject: [PATCH 06/33] fix(steamcmd): resolve steamcmd goldsource download
 issues (#4297)

* add appmanifest files to data

* refactor: improve appmanifest check and force update logic

The code changes refactor the `fn_appmanifest_check` function in the `core_steamcmd.sh` file. The improvements include:
- Checking if `BytesDownloaded` and `BytesToDownload` match, and forcing an update if they don't.
- Checking if `BytesStaged` and `BytesToStage` match, and forcing an update if they don't.
- For GoldSrc engine, checking if `SharedDepots` exists in the appmanifest file, and forcing an update if it doesn't.
- Fetching missing appmanifest files from GitHub for specific game shortnames.

These changes enhance the reliability of the appmanifest check process and ensure that updates are forced when necessary.

* refactor: improve removal of appinfo.vdf file

The code has been refactored to improve the removal of the appinfo.vdf file. The find command now redirects error output to /dev/null for a cleaner execution.

* fn_check_steamcmd_appmanifest is now a full check

* feat: add support for fetching appmanifest files

This commit adds support for fetching appmanifest files from the GitHub repository. The code now fetches the appropriate appmanifest files based on the game's shortname and updates them in the serverfiles/steamapps directory. This change ensures that the correct appmanifest files are used, fixing an issue related to updating certain games.

* more appmanifest files

* feat: add appmanifest_10.acf for Counter-Strike

Added the appmanifest_10.acf file for Counter-Strike to resolve an issue with missing SharedDepots. This commit fetches the necessary files from GitHub and forces an update to correct the issue.

* fix: fix missing SharedDepots in appmanifest_90.acf

The code changes fix a bug where the SharedDepots entry was missing from the appmanifest_90.acf file. The commit updates the error messages and logs to reflect the correct filename. Additionally, it forces an update to resolve the issue.
---
 lgsm/modules/core_steamcmd.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/modules/core_steamcmd.sh b/lgsm/modules/core_steamcmd.sh
index 54de61b7c..6d96a9e6c 100644
--- a/lgsm/modules/core_steamcmd.sh
+++ b/lgsm/modules/core_steamcmd.sh
@@ -355,8 +355,8 @@ fn_check_steamcmd_appmanifest() {
 	if [ "${engine}" == "goldsrc" ]; then
 		shareddepotsexists=$(grep -c SharedDepots "${serverfiles}/steamapps/appmanifest_90.acf")
 		if [ ! -f "${serverfiles}/steamapps/appmanifest_90.acf" ] || [ "${shareddepotsexists}" == "0" ]; then
-			fn_print_error_nl "SharedDepots missing from appmanifest_${appid}.acf"
-			fn_script_log_error "SharedDepots missing from appmanifest_${appid}.acf"
+			fn_print_error_nl "SharedDepots missing from appmanifest_90.acf"
+			fn_script_log_error "SharedDepots missing from appmanifest_90.acf"
 			fn_print_info_nl "Forcing update to correct issue"
 			fn_script_log_info "Forcing update to correct issue"
 			if [ "${shortname}" == "ahl" ]; then

From 6b9393f949af1f9d4bb8e69b7b175e8251fe799c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 30 Aug 2023 22:58:02 +0100
Subject: [PATCH 07/33] fix: improve sed command in
 fn_info_game_valve_keyvalues (#4300)

The sed command in the fn_info_game_valve_keyvalues function has been modified to improve its functionality. The change ensures that only the value between double quotes is captured, even if there are additional spaces before or after the value. This enhances the accuracy of extracting values from server configuration files.
---
 lgsm/modules/info_game.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh
index 2bfdc10e7..5eea7dfba 100644
--- a/lgsm/modules/info_game.sh
+++ b/lgsm/modules/info_game.sh
@@ -157,7 +157,7 @@ fn_info_game_valve_keyvalues() {
 	else
 		servercfgparse="${servercfgfullpath}"
 	fi
-	eval "${1}=\"$(sed -n '/^\<'"${2}"'\>/ { s/.*  *"\?\([^"]*\)"\?/\1/p;q }' "${servercfgparse}" | tr -d '\r')\""
+	eval "${1}=\"$(sed -n '/^\<'"${2}"'\>/ { s/.*  *"\([^"]*\)".*/\1/p;q }' "${servercfgparse}" | tr -d '\r')\""
 	configtype="valve_keyvalues"
 }
 

From 7b374249eae27f0de7a2b564e0663e1d062c4f28 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 1 Sep 2023 22:08:26 +0100
Subject: [PATCH 08/33] feat: change extip to public ip (#4301)

also change ark parms for epic to use publicip
---
 .../config-lgsm/arkserver/_default.cfg        |  2 +-
 .../config-lgsm/btlserver/_default.cfg        |  2 +-
 lgsm/modules/command_debug.sh                 |  6 ++---
 lgsm/modules/command_dev_details.sh           |  2 +-
 lgsm/modules/info_game.sh                     | 22 +++++++++----------
 lgsm/modules/info_messages.sh                 | 10 ++++-----
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg
index f391bb9b5..e3fb9654e 100644
--- a/lgsm/config-default/config-lgsm/arkserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/arkserver/_default.cfg
@@ -19,7 +19,7 @@ altsavedirectoryname="${defaultmap}"
 maxplayers="70"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods -crossplay -PublicIPForEpic=${ip}"
+startparameters="${defaultmap}?AltSaveDirectoryName=${altsavedirectoryname}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods -crossplay -PublicIPForEpic=${publicip}"
 
 #### LinuxGSM Settings ####
 
diff --git a/lgsm/config-default/config-lgsm/btlserver/_default.cfg b/lgsm/config-default/config-lgsm/btlserver/_default.cfg
index f1e744972..e26ca7e77 100644
--- a/lgsm/config-default/config-lgsm/btlserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/btlserver/_default.cfg
@@ -14,7 +14,7 @@ port="7777"
 queryport="7780"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="/Game/Maps/Final_Maps/Derailed?Game=/Script/ShooterGame.WartideGameMode?listen -log -broadcastip=\"${extip}\" -PORT=${port} -QueryPort=${queryport} -defgameini=\"${servercfgfullpath}\""
+startparameters="/Game/Maps/Final_Maps/Derailed?Game=/Script/ShooterGame.WartideGameMode?listen -log -broadcastip=\"${publicip}\" -PORT=${port} -QueryPort=${queryport} -defgameini=\"${servercfgfullpath}\""
 
 #### LinuxGSM Settings ####
 
diff --git a/lgsm/modules/command_debug.sh b/lgsm/modules/command_debug.sh
index c544e3e2a..41722e507 100644
--- a/lgsm/modules/command_debug.sh
+++ b/lgsm/modules/command_debug.sh
@@ -58,9 +58,9 @@ fi
 echo -e "${lightblue}Game Server IP:\t${default}${ip}:${port}"
 
 # External server IP.
-if [ "${extip}" ]; then
-	if [ "${ip}" != "${extip}" ]; then
-		echo -e "${lightblue}Internet IP:\t${default}${extip}:${port}"
+if [ "${publicip}" ]; then
+	if [ "${ip}" != "${publicip}" ]; then
+		echo -e "${lightblue}Internet IP:\t${default}${publicip}:${port}"
 	fi
 fi
 
diff --git a/lgsm/modules/command_dev_details.sh b/lgsm/modules/command_dev_details.sh
index 28abb87b1..b95418121 100644
--- a/lgsm/modules/command_dev_details.sh
+++ b/lgsm/modules/command_dev_details.sh
@@ -44,7 +44,7 @@ declare -A server_details=(
 	['HTTP Password']="${httppassword}"
 	['HTTP Port']="${httpport}"
 	['HTTP User']="${httpuser}"
-	['Internet IP']="${extip}"
+	['Internet IP']="${publicip}"
 	['LAN Port']="${lanport}"
 	['Master Port']="${masterport}"
 	['Master']="${master}"
diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh
index 5eea7dfba..641f5eeb1 100644
--- a/lgsm/modules/info_game.sh
+++ b/lgsm/modules/info_game.sh
@@ -2378,30 +2378,30 @@ fi
 
 # External IP address
 # Cache external IP address for 24 hours
-if [ -f "${tmpdir}/extip.txt" ]; then
-	if [ "$(find "${tmpdir}/extip.txt" -mmin +1440)" ]; then
-		rm -f "${tmpdir:?}/extip.txt"
+if [ -f "${tmpdir}/publicip.txt" ]; then
+	if [ "$(find "${tmpdir}/publicip.txt" -mmin +1440)" ]; then
+		rm -f "${tmpdir:?}/publicip.txt"
 	fi
 fi
 
-if [ ! -f "${tmpdir}/extip.txt" ]; then
-	extip="$(curl --connect-timeout 10 -s https://api.ipify.org 2> /dev/null)"
+if [ ! -f "${tmpdir}/publicip.txt" ]; then
+	publicip="$(curl --connect-timeout 10 -s https://api.ipify.org 2> /dev/null)"
 	exitcode=$?
-	# if curl passes add extip to externalip.txt
+	# if curl passes add publicip to externalip.txt
 	if [ "${exitcode}" == "0" ]; then
-		echo "${extip}" > "${tmpdir}/extip.txt"
+		echo "${publicip}" > "${tmpdir}/publicip.txt"
 	else
 		echo "Unable to get external IP address"
 	fi
 else
-	extip="$(cat "${tmpdir}/extip.txt")"
+	publicip="$(cat "${tmpdir}/publicip.txt")"
 fi
 
 # Alert IP address
 if [ "${displayip}" ]; then
 	alertip="${displayip}"
-elif [ "${extip}" ]; then
-	alertip="${extip}"
+elif [ "${publicip}" ]; then
+	alertip="${publicip}"
 else
 	alertip="${ip}"
 fi
@@ -2421,7 +2421,7 @@ if [ -z "${displaymasterserver}" ]; then
 		if [ -n "${ip}" ] && [ -n "${port}" ]; then
 			if [ "${steammaster}" == "true" ] || [ "${commandname}" == "DEV-QUERY-RAW" ]; then
 				# Query external IP first as most liky to succeed.
-				masterserver="$(curl --connect-timeout 10 -m 3 -s "https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${extip}&format=json" | jq --arg port "${port}" --arg queryport "${queryport}" --arg port3 "${port3}" 'if .response.servers != null then .response.servers[] | select((.gameport == ($port|tonumber) or .gameport == ($queryport|tonumber) or .gameport == ($port3|tonumber))) | .addr else empty end' | wc -l 2> /dev/null)"
+				masterserver="$(curl --connect-timeout 10 -m 3 -s "https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${publicip}&format=json" | jq --arg port "${port}" --arg queryport "${queryport}" --arg port3 "${port3}" 'if .response.servers != null then .response.servers[] | select((.gameport == ($port|tonumber) or .gameport == ($queryport|tonumber) or .gameport == ($port3|tonumber))) | .addr else empty end' | wc -l 2> /dev/null)"
 				if [ "${masterserver}" == "0" ]; then
 					# Loop though server IP addresses if external IP fails.
 					for queryip in "${queryips[@]}"; do
diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh
index 8c601a654..22319cdbd 100644
--- a/lgsm/modules/info_messages.sh
+++ b/lgsm/modules/info_messages.sh
@@ -166,8 +166,8 @@ fn_info_message_server_resource() {
 			echo -e "${lightblue}Link Speed:\t${default}${netlink}"
 		fi
 		echo -e "${lightblue}IP:\t${default}${ip}"
-		if [ "${ip}" != "${extip}" ]; then
-			echo -e "${lightblue}Internet IP:\t${default}${extip}"
+		if [ "${ip}" != "${publicip}" ]; then
+			echo -e "${lightblue}Internet IP:\t${default}${publicip}"
 		fi
 	} | column -s $'\t' -t
 }
@@ -274,9 +274,9 @@ fn_info_message_gameserver() {
 		echo -e "${lightblue}Server IP:\t${default}${ip}:${port}"
 
 		# Internet ip
-		if [ -n "${extip}" ]; then
-			if [ "${ip}" != "${extip}" ]; then
-				echo -e "${lightblue}Internet IP:\t${default}${extip}:${port}"
+		if [ -n "${publicip}" ]; then
+			if [ "${ip}" != "${publicip}" ]; then
+				echo -e "${lightblue}Internet IP:\t${default}${publicip}:${port}"
 			fi
 		fi
 

From b481ff1989afa38024500c6cf0db19aa56199c9d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 1 Sep 2023 23:12:35 +0100
Subject: [PATCH 09/33] fix: resolve edge case where RHEL servers might have
 dpkg installed (#4302)

For reasons unknown you can install dpkg in RHEL so instead this now looks for apt, yum or dnf
---
 lgsm/modules/check_deps.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh
index 560490b97..23edd69c6 100644
--- a/lgsm/modules/check_deps.sh
+++ b/lgsm/modules/check_deps.sh
@@ -93,16 +93,16 @@ fn_deps_email() {
 				array_deps_required+=(exim4)
 			elif [ -d /etc/sendmail ]; then
 				array_deps_required+=(sendmail)
-			elif [ "$(command -v dpkg-query 2> /dev/null)" ]; then
-				array_deps_required+=(mailutils postfix)
-			elif [ "$(command -v rpm 2> /dev/null)" ]; then
+			elif [ "$(command -v yum 2> /dev/null)" ] || [ "$(command -v dnf 2> /dev/null)" ]; then
 				array_deps_required+=(mailx postfix)
+			elif [ "$(command -v apt 2> /dev/null)" ]; then
+				array_deps_required+=(mailutils postfix)
 			fi
 		else
-			if [ "$(command -v dpkg-query 2> /dev/null)" ]; then
-				array_deps_required+=(mailutils postfix)
-			elif [ "$(command -v rpm 2> /dev/null)" ]; then
+			if [ "$(command -v yum 2> /dev/null)" ] || [ "$(command -v dnf 2> /dev/null)" ]; then
 				array_deps_required+=(mailx postfix)
+			elif [ "$(command -v apt 2> /dev/null)" ]; then
+				array_deps_required+=(mailutils postfix)
 			fi
 		fi
 	fi
@@ -144,7 +144,7 @@ fn_install_missing_deps() {
 		fi
 
 		# Add sudo dpkg --add-architecture i386 if using i386 packages.
-		if [ "$(command -v dpkg-query 2> /dev/null)" ]; then
+		if [ "$(command -v apt 2> /dev/null)" ]; then
 			if printf '%s\n' "${array_deps_required[@]}" | grep -q -P 'i386'; then
 				i386installcommand="sudo dpkg --add-architecture i386; "
 			fi
@@ -161,7 +161,7 @@ fn_install_missing_deps() {
 			echo -en "...\r"
 			sleep 1
 			echo -en "   \r"
-			if [ "$(command -v dpkg-query 2> /dev/null)" ]; then
+			if [ "$(command -v apt 2> /dev/null)" ]; then
 				cmd="echo steamcmd steam/question select \"I AGREE\" | sudo debconf-set-selections; echo steamcmd steam/license note '' | sudo debconf-set-selections; ${i386installcommand}sudo apt-get update; sudo apt-get -y install ${array_deps_missing[*]}"
 				eval "${cmd}"
 			elif [ "$(command -v dnf 2> /dev/null)" ]; then
@@ -181,7 +181,7 @@ fn_install_missing_deps() {
 
 		# If automatic dependency install is unavailable.
 		if [ "${autodepinstall}" != "0" ]; then
-			if [ "$(command -v dpkg-query 2> /dev/null)" ]; then
+			if [ "$(command -v apt 2> /dev/null)" ]; then
 				echo -e "${i386installcommand}sudo apt update; sudo apt install ${array_deps_missing[*]}"
 			elif [ "$(command -v dnf 2> /dev/null)" ]; then
 				echo -e "sudo dnf install ${array_deps_missing[*]}"
@@ -254,7 +254,7 @@ fn_deps_detector() {
 			depstatus=1
 			monostatus=1
 		fi
-	elif [ "$(command -v dpkg-query 2> /dev/null)" ]; then
+	elif [ "$(command -v apt 2> /dev/null)" ]; then
 		dpkg-query -W -f='${Status}' "${deptocheck}" 2> /dev/null | grep -q -P '^install ok installed'
 		depstatus=$?
 	elif [ "$(command -v dnf 2> /dev/null)" ]; then

From a5dbb4ad470d2fc22bacf6f9ab353f5fc0f8ea90 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 1 Sep 2023 23:38:51 +0100
Subject: [PATCH 10/33] fix: add socketname to core_legacy.sh

---
 lgsm/modules/core_legacy.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lgsm/modules/core_legacy.sh b/lgsm/modules/core_legacy.sh
index 173c893d2..7a7e554ed 100644
--- a/lgsm/modules/core_legacy.sh
+++ b/lgsm/modules/core_legacy.sh
@@ -15,6 +15,10 @@ for legacy_version in "${legacy_versions_array[@]}"; do
 	fi
 done
 
+if [ -z "${socketname}" ]; then
+	socketname="${sessionname}"
+fi
+
 if [ -n "${webadminuser}" ]; then
 	httpuser="${webadminuser}"
 fi

From aaff7c9bdb693fff9cd45c98afc8a1f4013ff47d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 2 Sep 2023 01:05:06 +0100
Subject: [PATCH 11/33] fix: Steam log symlink points to correct location

This commit adds the functionality to create a symbolic link for Steam logs if it is missing. The symlink is created in the specified log directory.
---
 lgsm/modules/check_logs.sh   | 5 +++++
 lgsm/modules/install_logs.sh | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lgsm/modules/check_logs.sh b/lgsm/modules/check_logs.sh
index 2087ac915..036eea5e4 100644
--- a/lgsm/modules/check_logs.sh
+++ b/lgsm/modules/check_logs.sh
@@ -24,3 +24,8 @@ fi
 if [ "${gamelogdir}" ] && [ -d "${gamelogdir}" ] && [ ! -d "${logdir}/server" ]; then
 	fn_check_logs
 fi
+
+# Create Steam log symlink if missing
+if [ ! -d "${logdir}/steam" ] && [ -n "${appid}" ]; then
+	fn_check_logs
+fi
diff --git a/lgsm/modules/install_logs.sh b/lgsm/modules/install_logs.sh
index 31a408506..cd26addd3 100644
--- a/lgsm/modules/install_logs.sh
+++ b/lgsm/modules/install_logs.sh
@@ -86,10 +86,10 @@ if [ "${gamelogdir}" ]; then
 fi
 
 # If server uses SteamCMD create a symbolic link to the Steam logs.
-if [ -d "${rootdir}/Steam/logs" ]; then
-	if [ ! -L "${logdir}/steamcmd" ]; then
-		echo -en "creating symlink to steam log dir: ${logdir}/steamcmd -> ${rootdir}/Steam/logs..."
-		if ! ln -nfs "${rootdir}/Steam/logs" "${logdir}/steamcmd"; then
+if [ -d "${HOME}/.steam/steam/logs" ]; then
+	if [ ! -L "${logdir}/steam" ]; then
+		echo -en "creating symlink to steam log dir: ${logdir}/steam -> ${HOME}/.steam/steam/logs..."
+		if ! ln -nfs "${HOME}/.steam/steam/logs" "${logdir}/steam"; then
 			fn_print_fail_eol_nl
 			core_exit.sh
 		else

From 49be44db239c38db008ebff61e13e8e41644c84f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 3 Sep 2023 21:13:21 +0100
Subject: [PATCH 12/33] feat: add mono support for Ubuntu 22.04 and Debian 12

This commit adds support for Ubuntu 22.04 and Debian 12 in the check_deps.sh script. It includes the necessary commands to install dependencies for Mono repository on these versions of the operating systems.
---
 lgsm/modules/check_deps.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh
index 23edd69c6..41334205e 100644
--- a/lgsm/modules/check_deps.sh
+++ b/lgsm/modules/check_deps.sh
@@ -19,7 +19,9 @@ fn_install_mono_repo() {
 		sleep 1
 		echo -en "   \r"
 		if [ "${distroid}" == "ubuntu" ]; then
-			if [ "${distroversion}" == "20.04" ]; then
+			if [ "${distroversion}" == "22.04" ]; then
+				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-jammy main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+			elif [ "${distroversion}" == "20.04" ]; then
 				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-focal main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "18.04" ]; then
 				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
@@ -29,7 +31,11 @@ fn_install_mono_repo() {
 				monoautoinstall="1"
 			fi
 		elif [ "${distroid}" == "debian" ]; then
-			if [ "${distroversion}" == "10" ]; then
+			if [ "${distroversion}" == "12" ]; then
+				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-bookworm main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+			elif [ "${distroversion}" == "11" ]; then
+				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-bullseye main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+			elif [ "${distroversion}" == "10" ]; then
 				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-buster main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "9" ]; then
 				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"

From 5f0f12a9b20e3f0fc8df86faac5318be7bacb19a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 4 Sep 2023 21:24:27 +0100
Subject: [PATCH 13/33] feat(vint): migrate to dotnet from mono (#4304)

* adde dotnet repo

* feat: update package dependencies for Ubuntu 16.04, 18.04, and 20.04

- Updated the package dependency for "vints" from "mono-complete" to "aspnetcore-runtime-7.0" in the Ubuntu 16.04, 18.04, and 20.04 CSV files.
- Also updated the package dependency for "vpmc" from "openjdk-8-jre" to "openjdk-11-jre" in the Ubuntu 18.04 and 20.04 CSV files.

This commit ensures that the correct package dependencies are specified for these Ubuntu versions, improving compatibility and functionality of the codebase.

* refactor: update dependency check for ASP.NET Core runtime

The code has been refactored to update the dependency check for the ASP.NET Core runtime. The condition that checks for the presence of "dotnet-runtime-7.0" has been changed to "aspnetcore-runtime-7.0". This ensures that the correct dependency is being checked and improves accuracy in determining if the required runtime is installed.

* fix: fix conditional statement in check_deps.sh

The commit fixes a bug in the conditional statement of the check_deps.sh script. Previously, it incorrectly checked if dotnetversion was empty instead of checking if it was not empty. This caused an incorrect value to be assigned to depstatus and dotnetinstalled variables. The bug has been fixed by correcting the conditional statement.

* refactor: simplify install_config.sh

This commit simplifies the `install_config.sh` file by removing unnecessary code for the "vints" configuration. The configuration is now generated on first run, and the list of config locations is still provided.

* refactor: improve error handling and display in core_exit.sh and install_config.sh

- In core_exit.sh, added a check to set exit code to 4 if it is not already set.
- In install_config.sh, improved the display of missing config file by highlighting the file path.

These changes aim to enhance the error handling and provide clearer information to users.

* feat: add exitcode handling to command_install.sh

The commit adds a check for the exitcode variable in command_install.sh. If it is empty, it sets it to 0. This change ensures proper handling of the exitcode in the script.

* refactor: improve installation process

The code changes in this commit refactor the installation process. The `command_install.sh` file has been modified to remove unnecessary code. Additionally, the `install_complete.sh` file has been updated to provide more informative messages based on the exit code. This improves the overall clarity and user experience during installation.

Co-authored-by: AI Assistant <assistant@example.com>

* refactor: remove redundant code in install_config.sh

The commit removes a redundant function call in the install_config.sh file. The "fn_list_config_locations" function is no longer needed for the "vints" configuration.

* a

* refactor: improve logging in command_stop.sh

- Changed `fn_script_log_error` to `fn_script_log_info` for consistency
- Removed unnecessary empty line

* refactor: dont try to stop a server that is already stopped

* refactor: remove redundant code and improve socket name generation

The commit refactors the code in `command_start.sh` and `linuxgsm.sh` to remove redundant code related to generating a unique tmux socket name. The code now creates a uid file if it doesn't exist, stops the running server, generates a uid using the current timestamp, and updates the socketname accordingly. This change improves the efficiency and reliability of socket name generation.

* refactor: remove unnecessary command_stop.sh call

The code change removes the unnecessary call to `command_stop.sh` in the `linuxgsm.sh` file. This improves efficiency and prevents lingering tmux sessions.

* refactor: remove duplicate code for creating unique tmux socket name

The code changes in `command_start.sh` and `linuxgsm.sh` refactor the creation of a unique tmux socket name. The duplicate code in `linuxgsm.sh` has been removed, resulting in cleaner and more efficient code.

* refactor: improve socketname assignment

The code change refactors the socketname assignment in the linuxgsm.sh script. Instead of directly assigning it to "${sessionname}-$(cat "${datadir}/${selfname}.uid")", it now checks if the file "${datadir}/${selfname}.uid" exists before assigning the value. This improves error handling and prevents potential issues when the file doesn't exist.
---
 lgsm/data/almalinux-8.csv                |   2 +-
 lgsm/data/almalinux-9.csv                |   2 +-
 lgsm/data/centos-7.csv                   |   2 +-
 lgsm/data/centos-8.csv                   |   2 +-
 lgsm/data/centos-9.csv                   |   2 +-
 lgsm/data/debian-10.csv                  |   2 +-
 lgsm/data/debian-11.csv                  |   2 +-
 lgsm/data/debian-12.csv                  |   2 +-
 lgsm/data/debian-9.csv                   |   2 +-
 lgsm/data/rhel-7.csv                     |   2 +-
 lgsm/data/rhel-8.csv                     |   2 +-
 lgsm/data/rhel-9.csv                     |   2 +-
 lgsm/data/rocky-8.csv                    |   2 +-
 lgsm/data/rocky-9.csv                    |   2 +-
 lgsm/data/ubuntu-16.04.csv               |   2 +-
 lgsm/data/ubuntu-18.04.csv               |   2 +-
 lgsm/data/ubuntu-20.04.csv               |   2 +-
 lgsm/data/ubuntu-21.04.csv               | 135 -----------------------
 lgsm/data/ubuntu-21.10.csv               | 135 -----------------------
 lgsm/data/ubuntu-22.04.csv               |   2 +-
 lgsm/data/ubuntu-23.04.csv               |   2 +-
 lgsm/modules/check_deps.sh               |  47 ++++++--
 lgsm/modules/command_dev_detect_glibc.sh |   2 +-
 lgsm/modules/command_install.sh          |   1 +
 lgsm/modules/command_start.sh            |  11 +-
 lgsm/modules/command_stop.sh             |  15 ++-
 lgsm/modules/core_dl.sh                  |   2 +-
 lgsm/modules/core_exit.sh                |   2 +
 lgsm/modules/info_distro.sh              |   4 +
 lgsm/modules/install_complete.sh         |  16 ++-
 lgsm/modules/install_config.sh           |   9 +-
 linuxgsm.sh                              |   3 +-
 32 files changed, 99 insertions(+), 321 deletions(-)
 delete mode 100644 lgsm/data/ubuntu-21.04.csv
 delete mode 100644 lgsm/data/ubuntu-21.10.csv

diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
index ee8301e53..78ee5945d 100644
--- a/lgsm/data/almalinux-8.csv
+++ b/lgsm/data/almalinux-8.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv
index c7d86c6e3..b341b7282 100644
--- a/lgsm/data/almalinux-9.csv
+++ b/lgsm/data/almalinux-9.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
index 2bd1ea57a..616e61c32 100644
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-11-openjdk
 vs
 wet
diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
index ee8301e53..78ee5945d 100644
--- a/lgsm/data/centos-8.csv
+++ b/lgsm/data/centos-8.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv
index c7d86c6e3..b341b7282 100644
--- a/lgsm/data/centos-9.csv
+++ b/lgsm/data/centos-9.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/debian-10.csv b/lgsm/data/debian-10.csv
index 646df8b2b..fd29e6da3 100644
--- a/lgsm/data/debian-10.csv
+++ b/lgsm/data/debian-10.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vs
 wet
diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv
index 8f31ec9c4..6f34e2832 100644
--- a/lgsm/data/debian-11.csv
+++ b/lgsm/data/debian-11.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vs
 wet
diff --git a/lgsm/data/debian-12.csv b/lgsm/data/debian-12.csv
index 51b565a00..3738c4749 100644
--- a/lgsm/data/debian-12.csv
+++ b/lgsm/data/debian-12.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-17-jre
 vs
 wet
diff --git a/lgsm/data/debian-9.csv b/lgsm/data/debian-9.csv
index 8ff958ddd..794a54afe 100644
--- a/lgsm/data/debian-9.csv
+++ b/lgsm/data/debian-9.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-8-jre
 vs
 wet
diff --git a/lgsm/data/rhel-7.csv b/lgsm/data/rhel-7.csv
index 196651a2f..1b0b8c1bd 100644
--- a/lgsm/data/rhel-7.csv
+++ b/lgsm/data/rhel-7.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-11-openjdk
 vs
 wet
diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv
index ee8301e53..78ee5945d 100644
--- a/lgsm/data/rhel-8.csv
+++ b/lgsm/data/rhel-8.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/rhel-9.csv b/lgsm/data/rhel-9.csv
index c7d86c6e3..b341b7282 100644
--- a/lgsm/data/rhel-9.csv
+++ b/lgsm/data/rhel-9.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv
index ee8301e53..78ee5945d 100644
--- a/lgsm/data/rocky-8.csv
+++ b/lgsm/data/rocky-8.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv
index c7d86c6e3..b341b7282 100644
--- a/lgsm/data/rocky-9.csv
+++ b/lgsm/data/rocky-9.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,glibc-devel
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vs
 wet
diff --git a/lgsm/data/ubuntu-16.04.csv b/lgsm/data/ubuntu-16.04.csv
index 3e860cd1f..0fac4905f 100644
--- a/lgsm/data/ubuntu-16.04.csv
+++ b/lgsm/data/ubuntu-16.04.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-8-jre
 vs
 wet
diff --git a/lgsm/data/ubuntu-18.04.csv b/lgsm/data/ubuntu-18.04.csv
index 646df8b2b..fd29e6da3 100644
--- a/lgsm/data/ubuntu-18.04.csv
+++ b/lgsm/data/ubuntu-18.04.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vs
 wet
diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
index bb026e94a..a51acccd0 100644
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vs
 wet
diff --git a/lgsm/data/ubuntu-21.04.csv b/lgsm/data/ubuntu-21.04.csv
deleted file mode 100644
index 8f31ec9c4..000000000
--- a/lgsm/data/ubuntu-21.04.csv
+++ /dev/null
@@ -1,135 +0,0 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
-steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
-ac
-ahl
-ahl2
-ark
-arma3
-armar,libcurl4
-ats
-av
-bb
-bb2,libcurl4-gnutls-dev:i386
-bd
-bf1942,libncurses5:i386,libtinfo5:i386
-bfv,libncurses5:i386,libstdc++5:i386
-bmdm,libncurses5:i386
-bo
-bs
-bt,libicu-dev,dos2unix,libxml2-utils
-btl
-cc
-cd
-ck,xvfb,libxi6
-cmw
-cod,libstdc++5:i386
-cod2,libstdc++5:i386
-cod4
-coduo,libstdc++5:i386
-codwaw
-col
-cs
-cscz
-csgo
-css,libtinfo5:i386
-ct
-dab
-dayz
-dmc
-dod
-dodr
-dods
-doi
-dst,libcurl4-gnutls-dev:i386
-dys
-eco,libgdiplus
-em
-etl
-ets2
-fctr
-fof
-gmod,libtinfo5:i386
-hcu
-hl2dm
-hldm
-hldms
-hw,lib32z1
-ins
-inss
-ios
-jc2
-jc3
-jk2
-kf
-kf2
-l4d
-l4d2
-lo
-mc,openjdk-17-jre
-mcb
-mh
-mohaa,libstdc++5:i386
-mom
-mta,libncursesw5,libxml2-utils
-nd
-nec
-nmrih,libtinfo5:i386
-ns
-ns2,speex,libtbb2
-ns2c,speex:i386,libtbb2
-ohd
-onset,libmariadb-dev
-opfor
-pc
-pc2
-pmc,openjdk-17-jre
-pstbs,libgconf-2-4
-pvkii
-pvr,libc++1
-pz,openjdk-17-jre,rng-tools
-q2
-q3
-ql
-qw
-ricochet
-ro
-rtcw
-rust,lib32z1
-rw,openjdk-17-jre
-samp
-sb
-sbots
-scpsl,mono-complete
-scpslsm,mono-complete
-sdtd,telnet,expect,libxml2-utils
-sf
-sfc,libtinfo5:i386
-sof2
-sol
-squad
-st,libxml2-utils
-stn
-sven,libssl1.1:i386,zlib1g:i386
-terraria
-tf2,libcurl4-gnutls-dev:i386
-tfc
-ti
-ts
-ts3
-tu
-tw
-unt
-ut
-ut2k4
-ut3
-ut99
-vh,libc6-dev
-vints,mono-complete
-vpmc,openjdk-11-jre
-vs
-wet
-wf
-wmc,openjdk-17-jre
-wurm,xvfb
-zmr,libtinfo5:i386
-zps,libtinfo5:i386
diff --git a/lgsm/data/ubuntu-21.10.csv b/lgsm/data/ubuntu-21.10.csv
deleted file mode 100644
index 8f31ec9c4..000000000
--- a/lgsm/data/ubuntu-21.10.csv
+++ /dev/null
@@ -1,135 +0,0 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
-steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
-ac
-ahl
-ahl2
-ark
-arma3
-armar,libcurl4
-ats
-av
-bb
-bb2,libcurl4-gnutls-dev:i386
-bd
-bf1942,libncurses5:i386,libtinfo5:i386
-bfv,libncurses5:i386,libstdc++5:i386
-bmdm,libncurses5:i386
-bo
-bs
-bt,libicu-dev,dos2unix,libxml2-utils
-btl
-cc
-cd
-ck,xvfb,libxi6
-cmw
-cod,libstdc++5:i386
-cod2,libstdc++5:i386
-cod4
-coduo,libstdc++5:i386
-codwaw
-col
-cs
-cscz
-csgo
-css,libtinfo5:i386
-ct
-dab
-dayz
-dmc
-dod
-dodr
-dods
-doi
-dst,libcurl4-gnutls-dev:i386
-dys
-eco,libgdiplus
-em
-etl
-ets2
-fctr
-fof
-gmod,libtinfo5:i386
-hcu
-hl2dm
-hldm
-hldms
-hw,lib32z1
-ins
-inss
-ios
-jc2
-jc3
-jk2
-kf
-kf2
-l4d
-l4d2
-lo
-mc,openjdk-17-jre
-mcb
-mh
-mohaa,libstdc++5:i386
-mom
-mta,libncursesw5,libxml2-utils
-nd
-nec
-nmrih,libtinfo5:i386
-ns
-ns2,speex,libtbb2
-ns2c,speex:i386,libtbb2
-ohd
-onset,libmariadb-dev
-opfor
-pc
-pc2
-pmc,openjdk-17-jre
-pstbs,libgconf-2-4
-pvkii
-pvr,libc++1
-pz,openjdk-17-jre,rng-tools
-q2
-q3
-ql
-qw
-ricochet
-ro
-rtcw
-rust,lib32z1
-rw,openjdk-17-jre
-samp
-sb
-sbots
-scpsl,mono-complete
-scpslsm,mono-complete
-sdtd,telnet,expect,libxml2-utils
-sf
-sfc,libtinfo5:i386
-sof2
-sol
-squad
-st,libxml2-utils
-stn
-sven,libssl1.1:i386,zlib1g:i386
-terraria
-tf2,libcurl4-gnutls-dev:i386
-tfc
-ti
-ts
-ts3
-tu
-tw
-unt
-ut
-ut2k4
-ut3
-ut99
-vh,libc6-dev
-vints,mono-complete
-vpmc,openjdk-11-jre
-vs
-wet
-wf
-wmc,openjdk-17-jre
-wurm,xvfb
-zmr,libtinfo5:i386
-zps,libtinfo5:i386
diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
index ba801e507..7f417b463 100644
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-17-jre
 vs
 wet
diff --git a/lgsm/data/ubuntu-23.04.csv b/lgsm/data/ubuntu-23.04.csv
index ba801e507..7f417b463 100644
--- a/lgsm/data/ubuntu-23.04.csv
+++ b/lgsm/data/ubuntu-23.04.csv
@@ -124,7 +124,7 @@ ut2k4
 ut3
 ut99
 vh,libc6-dev
-vints,mono-complete
+vints,aspnetcore-runtime-7.0
 vpmc,openjdk-17-jre
 vs
 wet
diff --git a/lgsm/modules/check_deps.sh b/lgsm/modules/check_deps.sh
index 41334205e..2818ffc11 100644
--- a/lgsm/modules/check_deps.sh
+++ b/lgsm/modules/check_deps.sh
@@ -7,6 +7,19 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
+fn_install_dotnet_repo() {
+	if [ "${distroid}" == "ubuntu" ]; then
+		# if package aspnetcore-runtime-7.0 is unavailable in ubuntu repos, add the microsoft repo.
+		if ! apt-cache show aspnetcore-runtime-7.0 > /dev/null 2>&1; then
+			fn_fetch_file "https://packages.microsoft.com/config/ubuntu/${distroversion}/packages-microsoft-prod.deb" "" "" "" "/tmp" "packages-microsoft-prod.deb" "" "" "" ""
+			sudo dpkg -i /tmp/packages-microsoft-prod.deb
+		fi
+	elif [ "${distroid}" == "debian" ]; then
+		fn_fetch_file "https://packages.microsoft.com/config/debian/${distroversion}/packages-microsoft-prod.deb" "" "" "" "/tmp" "packages-microsoft-prod.deb" "" "" "" ""
+		sudo dpkg -i /tmp/packages-microsoft-prod.deb
+	fi
+}
+
 fn_install_mono_repo() {
 	if [ "${autodepinstall}" == "0" ]; then
 		fn_print_information_nl "Automatically adding Mono repository."
@@ -20,11 +33,11 @@ fn_install_mono_repo() {
 		echo -en "   \r"
 		if [ "${distroid}" == "ubuntu" ]; then
 			if [ "${distroversion}" == "22.04" ]; then
-				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-jammy main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+				cmd="sudo apt-get install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-jammy main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "20.04" ]; then
-				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-focal main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+				cmd="sudo apt-get install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-focal main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "18.04" ]; then
-				cmd="sudo apt install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+				cmd="sudo apt-get install gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "16.04" ]; then
 				cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https ca-certificates;echo 'deb https://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			else
@@ -32,13 +45,13 @@ fn_install_mono_repo() {
 			fi
 		elif [ "${distroid}" == "debian" ]; then
 			if [ "${distroversion}" == "12" ]; then
-				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-bookworm main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+				cmd="sudo apt-get install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-bookworm main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "11" ]; then
-				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-bullseye main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+				cmd="sudo apt-get install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-bullseye main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "10" ]; then
-				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-buster main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+				cmd="sudo apt-get install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-buster main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			elif [ "${distroversion}" == "9" ]; then
-				cmd="sudo apt install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
+				cmd="sudo apt-get install apt-transport-https dirmngr gnupg ca-certificates;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update"
 			else
 				monoautoinstall="1"
 			fi
@@ -135,10 +148,14 @@ fn_install_missing_deps() {
 		fi
 		autodepinstall="$?"
 
-		if [ "${monostatus}" == "1" ]; then
+		if [ "${monoinstalled}" == "false" ]; then
 			fn_install_mono_repo
 		fi
 
+		if [ "${dotnetinstalled}" == "false" ]; then
+			fn_install_dotnet_repo
+		fi
+
 		if [ "${commandname}" == "INSTALL" ]; then
 			if [ "${autodepinstall}" == "0" ]; then
 				fn_print_information_nl "$(whoami) has sudo access."
@@ -254,11 +271,21 @@ fn_deps_detector() {
 		if [ -n "${monoversion}" ] && [ "${monoversion}" -ge "5" ]; then
 			# Mono >= 5.0.0 already installed.
 			depstatus=0
-			monostatus=0
+			monoinstalled=true
 		else
 			# Mono not installed or installed Mono < 5.0.0.
 			depstatus=1
-			monostatus=1
+			monoinstalled=false
+		fi
+	# .NET Core: A .NET Core repo needs to be installed.
+	elif [ "${deptocheck}" == "aspnetcore-runtime-7.0" ]; then
+		# .NET is not installed.
+		if [ -n "${dotnetversion}" ]; then
+			depstatus=0
+			dotnetinstalled=true
+		else
+			depstatus=1
+			dotnetinstalled=false
 		fi
 	elif [ "$(command -v apt 2> /dev/null)" ]; then
 		dpkg-query -W -f='${Status}' "${deptocheck}" 2> /dev/null | grep -q -P '^install ok installed'
diff --git a/lgsm/modules/command_dev_detect_glibc.sh b/lgsm/modules/command_dev_detect_glibc.sh
index 8ff87d711..ca64ed7cc 100644
--- a/lgsm/modules/command_dev_detect_glibc.sh
+++ b/lgsm/modules/command_dev_detect_glibc.sh
@@ -15,7 +15,7 @@ echo -e "================================="
 echo -e "glibc Requirements Checker"
 echo -e "================================="
 
-if [ ! "$(command -v objdump)" ]; then
+if [ ! "$(command -v objdump 2> /dev/null)" ]; then
 	fn_print_failure_nl "objdump is missing"
 	fn_script_log_fatal "objdump is missing"
 	core_exit.sh
diff --git a/lgsm/modules/command_install.sh b/lgsm/modules/command_install.sh
index e8cba7560..b3edd67c8 100644
--- a/lgsm/modules/command_install.sh
+++ b/lgsm/modules/command_install.sh
@@ -48,5 +48,6 @@ else
 	fix.sh
 	install_stats.sh
 	install_complete.sh
+
 fi
 core_exit.sh
diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh
index 1302d0d99..963815b1b 100644
--- a/lgsm/modules/command_start.sh
+++ b/lgsm/modules/command_start.sh
@@ -50,9 +50,12 @@ fn_start_tmux() {
 
 	# Create uid to ensure unique tmux socket name.
 	if [ ! -f "${datadir}/${selfname}.uid" ]; then
-		# stop running server (if running) to prevent lingering tmux sessions.
-		exitbypass=1
-		command_stop.sh
+		check_status.sh
+		if [ "${status}" != "0" ]; then
+			# stop running server (if running) to prevent lingering tmux sessions.
+			exitbypass=1
+			command_stop.sh
+		fi
 		uid=$(date '+%s' | sha1sum | head -c 8)
 		echo "${uid}" > "${datadir}/${selfname}.uid"
 		socketname="${sessionname}-$(cat "${datadir}/${selfname}.uid")"
@@ -181,7 +184,7 @@ fn_start_tmux() {
 check.sh
 
 # If user ran the start command monitor will become enabled.
-if [ "${firstcommandname}" == "START" ]||[ "${firstcommandname}" == "RESTART" ]; then
+if [ "${firstcommandname}" == "START" ] || [ "${firstcommandname}" == "RESTART" ]; then
 	date '+%s' > "${lockdir:?}/${selfname}-monitoring.lock"
 fi
 
diff --git a/lgsm/modules/command_stop.sh b/lgsm/modules/command_stop.sh
index dc716216f..409e57b14 100644
--- a/lgsm/modules/command_stop.sh
+++ b/lgsm/modules/command_stop.sh
@@ -256,15 +256,15 @@ fn_stop_tmux() {
 fn_stop_pre_check() {
 	if [ "${status}" == "0" ]; then
 		fn_print_info_nl "${servername} is already stopped"
-		fn_script_log_error "${servername} is already stopped"
+		fn_script_log_info "${servername} is already stopped"
 	else
 		# Select graceful shutdown.
 		fn_stop_graceful_select
-	fi
-	# Check status again, a kill tmux session if graceful shutdown failed.
-	check_status.sh
-	if [ "${status}" != "0" ]; then
-		fn_stop_tmux
+		# Check status again, a kill tmux session if graceful shutdown failed.
+		check_status.sh
+		if [ "${status}" != "0" ]; then
+			fn_stop_tmux
+		fi
 	fi
 }
 
@@ -282,11 +282,10 @@ fn_stop_pre_check
 rm -f "${lockdir:?}/${selfname}-started.lock"
 
 # If user ran the stop command monitor will become disabled.
-if [ "${firstcommandname}" == "STOP" ];then
+if [ "${firstcommandname}" == "STOP" ]; then
 	rm -f "${lockdir:?}/${selfname}-monitoring.lock"
 fi
 
-
 # Remove stopping lockfile.
 rm -f "${lockdir:?}/${selfname}-stopping.lock"
 
diff --git a/lgsm/modules/core_dl.sh b/lgsm/modules/core_dl.sh
index f85499890..2a6c7c400 100644
--- a/lgsm/modules/core_dl.sh
+++ b/lgsm/modules/core_dl.sh
@@ -36,7 +36,7 @@ fn_dl_steamcmd() {
 
 	# Unbuffer will allow the output of steamcmd not buffer allowing a smooth output.
 	# unbuffer us part of the expect package.
-	if [ "$(command -v unbuffer)" ]; then
+	if [ "$(command -v unbuffer 2> /dev/null)" ]; then
 		unbuffer="unbuffer"
 	fi
 
diff --git a/lgsm/modules/core_exit.sh b/lgsm/modules/core_exit.sh
index a66744b19..6947a3d4a 100644
--- a/lgsm/modules/core_exit.sh
+++ b/lgsm/modules/core_exit.sh
@@ -35,7 +35,9 @@ elif [ "${exitcode}" != "0" ]; then
 	elif [ "${exitcode}" == "3" ]; then
 		fn_script_log_warn "${moduleselfname} exiting with code: ${exitcode}"
 	else
+		# if exit code is not set assume error.
 		fn_script_log_warn "${moduleselfname} exiting with code: ${exitcode}"
+		exitcode=4
 	fi
 	fn_exit_dev_debug
 	# remove trap.
diff --git a/lgsm/modules/info_distro.sh b/lgsm/modules/info_distro.sh
index b375f8c02..aacee2b8f 100644
--- a/lgsm/modules/info_distro.sh
+++ b/lgsm/modules/info_distro.sh
@@ -127,6 +127,10 @@ if [ "$(command -v mono 2> /dev/null)" ]; then
 	monoversion="$(mono --version 2>&1 | grep -Po '(?<=version )\d')"
 fi
 
+if [ "$(command -v dotnet 2> /dev/null)" ]; then
+	dotnetversion="$(dotnet --list-runtimes | grep -E 'Microsoft\.NETCore\.App' | awk '{print $2}')"
+fi
+
 ## Uptime
 uptime="$(< /proc/uptime)"
 uptime=${uptime/[. ]*/}
diff --git a/lgsm/modules/install_complete.sh b/lgsm/modules/install_complete.sh
index 58189a4be..013ba7334 100644
--- a/lgsm/modules/install_complete.sh
+++ b/lgsm/modules/install_complete.sh
@@ -9,7 +9,21 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 echo -e ""
 echo -e "================================="
-echo -e "Install Complete!"
+
+if [ "${exitcode}" == "1" ]; then
+	echo -e "Install Failed!"
+	fn_script_log_fatal "Install Failed!"
+elif [ "${exitcode}" == "2" ]; then
+	echo -e "Install Completed with Errors!"
+	fn_script_log_error "Install Completed with Errors!"
+elif [ "${exitcode}" == "3" ]; then
+	echo -e "Install Completed with Warnings!"
+	fn_script_log_warn "Install Completed with Warnings!"
+elif [ -z "${exitcode}" ] || [ "${exitcode}" == "0" ]; then
+	echo -e "Install Complete!"
+	fn_script_log_pass "Install Complete!"
+fi
+
 fn_script_log_info "Install Complete!"
 echo -e ""
 echo -e "To start server type:"
diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh
index e868e9bf7..9a49b821c 100644
--- a/lgsm/modules/install_config.sh
+++ b/lgsm/modules/install_config.sh
@@ -154,7 +154,7 @@ fn_list_config_locations() {
 		elif [ -d "${servercfgfullpath}" ]; then
 			echo -e "Game Server Config Dir: ${servercfgfullpath}"
 		else
-			echo -e "Config file: ${red}${servercfgfullpath} (${red}FILE MISSING${default})"
+			echo -e "Config file: ${red}${servercfgfullpath}${default} (${red}FILE MISSING${default})"
 		fi
 	fi
 	echo -e "LinuxGSM Config: ${lgsmdir}/config-lgsm/${gameservername}"
@@ -787,11 +787,8 @@ elif [ "${shortname}" == "unt" ]; then
 	fn_set_config_vars
 	fn_list_config_locations
 elif [ "${shortname}" == "vints" ]; then
-	array_configs+=(serverconfig.json)
-	fn_fetch_default_config
-	fn_default_config_remote
-	fn_set_config_vars
-	fn_list_config_locations
+	# Config is generated on first run
+	:
 elif [ "${shortname}" == "vs" ]; then
 	array_configs+=(server.cfg)
 	fn_fetch_default_config
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 331a61822..d6b526e0e 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -36,7 +36,7 @@ tmpdir="${lgsmdir}/tmp"
 datadir="${lgsmdir}/data"
 lockdir="${lgsmdir}/lock"
 sessionname="${selfname}"
-[ -f "${datadir}/${selfname}.uid" ] && socketname="${sessionname}-$(cat "${datadir}/${selfname}.uid")" || socketname="${sessionname}"
+[ -f "${datadir}/${selfname}.uid" ] && socketname="${sessionname}-$(cat "${datadir}/${selfname}.uid")"
 serverlist="${datadir}/serverlist.csv"
 serverlistmenu="${datadir}/serverlistmenu.csv"
 [ -n "${LGSM_CONFIG}" ] && configdir="${LGSM_CONFIG}" || configdir="${lgsmdir}/config-lgsm"
@@ -413,6 +413,7 @@ else
 			fi
 		fi
 	fi
+
 	# Load the IP details before the first config is loaded.
 	check_ip.sh
 	# Configs have to be loaded twice to allow start startparameters to pick up all vars

From ac78fc1b8fccc8e5b1d012e5fc666a9cea8b3507 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 4 Sep 2023 22:10:41 +0100
Subject: [PATCH 14/33] fix(pz): correct start parameters (#4305)

* refactor: remove unnecessary memory allocation in pzserver config

The startparameters variable in the pzserver configuration file was modified to remove the unnecessary memory allocation parameter. This change simplifies the configuration and improves efficiency.

* refactor: simplify startparameters in pzserver config

The startparameters in the pzserver config file have been simplified to only include the server name. This change removes unnecessary parameters and improves readability.
---
 lgsm/config-default/config-lgsm/pzserver/_default.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/pzserver/_default.cfg b/lgsm/config-default/config-lgsm/pzserver/_default.cfg
index b103eb772..b82f136ed 100644
--- a/lgsm/config-default/config-lgsm/pzserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/pzserver/_default.cfg
@@ -10,11 +10,10 @@
 
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
-javaram="8192" # -Xmx$8192M
 adminpassword="CHANGE_ME"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="--ip ${ip} -adminpassword \"${adminpassword}\" -servername ${selfname} -Xmx${javaram}M"
+startparameters="-servername ${selfname}"
 
 #### LinuxGSM Settings ####
 

From 8a9f34321d57b101d08b2f42c9549cd39812622a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 4 Sep 2023 23:11:56 +0100
Subject: [PATCH 15/33] feat(inss): add optional gslt to start parameters

---
 lgsm/config-default/config-lgsm/inssserver/_default.cfg | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index b08460b29..820058ada 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -19,9 +19,14 @@ defaultmap="Canyon"
 defaultscenario="Scenario_Crossing_Push_Security"
 maxplayers="28"
 
+## Game Server Login Token (GSLT): Optional
+# GSLT can be used for running a public server.
+# More info: https://docs.linuxgsm.com/steamcmd/gslt
+gslt=""
+
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 ## Parameter Docs | https://mod.io/g/insurgencysandstorm/r/server-admin-guide
-startparameters="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers} -Port=${port} -QueryPort=${queryport} -hostname='${servername}' -Rcon -RconPassword=${rconpassword} -RconListenPort=${rconport} -log"
+startparameters="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers} -Port=${port} -QueryPort=${queryport} -hostname='${servername}' -Rcon -RconPassword=${rconpassword} -RconListenPort=${rconport} -GSLTToken=${gslt} -log"
 
 #### LinuxGSM Settings ####
 

From 65e3a93d0dfb12720079cc77061462e933a6f5d8 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Sep 2023 00:01:07 +0100
Subject: [PATCH 16/33] fix(unt): config is auto generated

---
 lgsm/config-default/config-lgsm/untserver/_default.cfg | 6 ++++--
 lgsm/modules/install_config.sh                         | 7 ++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/untserver/_default.cfg b/lgsm/config-default/config-lgsm/untserver/_default.cfg
index a7de22b4d..f5aa19e5b 100644
--- a/lgsm/config-default/config-lgsm/untserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/untserver/_default.cfg
@@ -13,14 +13,16 @@ ip="0.0.0.0"
 port="27015"
 maxplayers="20"
 defaultmap="PEI"
-
+servername="LinuxGSM"
+perspective="first" # Values: first, third, vehicle, Both.
+gamemode="normal" # Values: normal, easy, gold.
 ## Game Server Login Token (GSLT): Required
 # GSLT is required for running a public server.
 # More info: https://docs.linuxgsm.com/steamcmd/gslt
 gslt=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-nographics -batchmode -bind ${ip} -port ${port} -maxplayers ${maxplayers} -map ${defaultmap} -gslt ${gslt} +InternetServer/${selfname}"
+startparameters="-nographics -batchmode -bind ${ip} -port ${port} -maxplayers ${maxplayers} -perspective ${perspective} -mode ${gamemode} -name ${servername} -map ${defaultmap} -gslt ${gslt} +InternetServer/${selfname}"
 
 #### LinuxGSM Settings ####
 
diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh
index 9a49b821c..9dc0841d5 100644
--- a/lgsm/modules/install_config.sh
+++ b/lgsm/modules/install_config.sh
@@ -781,11 +781,8 @@ elif [ "${shortname}" == "ut99" ]; then
 	fn_set_config_vars
 	fn_list_config_locations
 elif [ "${shortname}" == "unt" ]; then
-	array_configs+=(Config.json)
-	fn_fetch_default_config
-	fn_default_config_remote
-	fn_set_config_vars
-	fn_list_config_locations
+	# Config is generated on first run
+	:
 elif [ "${shortname}" == "vints" ]; then
 	# Config is generated on first run
 	:

From 82e5da4b1d59ac29d8e701846355e5977fbf3e12 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 6 Sep 2023 14:27:10 +0100
Subject: [PATCH 17/33] fix(info_game): refactor key value pairs parsing

split out space and equals delimited
---
 lgsm/modules/info_game.sh | 82 +++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 29 deletions(-)

diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh
index 641f5eeb1..dbce9e203 100644
--- a/lgsm/modules/info_game.sh
+++ b/lgsm/modules/info_game.sh
@@ -34,10 +34,9 @@ fn_info_game_ini() {
 	configtype="ini"
 }
 
-# Config Type: custom
+# Config Type: Key Value Pairs (Equals Delimited)
 # Comment: ; or #
-# Note: this ini filter does not filter by section. Can cause issues with some games that have multiple sections with the same variable name.
-fn_info_game_keyvalue_pairs() {
+fn_info_game_keyvalue_pairs_equals() {
 	# sed is used to process the file.
 	# -n: Suppresses automatic printing of pattern space.
 	# /^\<'"${2}"'\>/: Matches lines starting with the word provided as the second argument ($2), considering it as a whole word.
@@ -60,6 +59,31 @@ fn_info_game_keyvalue_pairs() {
 	configtype="keyvalue_pairs"
 }
 
+# Config Type: Key Value Pairs (Space Delimited)
+# Comment: ; or #
+fn_info_game_keyvalue_pairs_space() {
+	# sed is used to process the file.
+	# -n: Suppresses automatic printing of pattern space.
+	# /^\<'"${2}"'\>/: Matches lines starting with the word provided as the second argument ($2), considering it as a whole word.
+	# { s/.*  *"\?\([^"]*\)"\?/\1/p;q }: Command block executed for lines that match the pattern.
+	#   - s/.*  *"\?\([^"]*\)"\?/\1/: Matches and captures the value after an space ( ), possibly surrounded by optional double quotes.
+	#     - .*: Matches any characters before the space.
+	#     - = *"\?: Matches the space and any optional spaces before an optional double quote.
+	#     - \([^"]*\): Captures any characters that are not double quotes.
+	#     - "\?: Matches an optional double quote.
+	#     - /1: Replaces the entire matched pattern with the captured value.
+	#   - p: Prints the modified line.
+	#   - q: Quits processing after modifying and printing the line.
+
+	if [ -n "${3}" ]; then
+		servercfgparse="${3}"
+	else
+		servercfgparse="${servercfgfullpath}"
+	fi
+	eval "${1}=\"$(sed -n '/^\<'"${2}"'\>/ { s/.*  *\"\?\([^"]*\)\"\?/\1/p;q }' "${servercfgparse}" | tr -d '\r')\""
+	configtype="keyvalue_pairs"
+}
+
 # Config Type: QuakeC
 # Comment: // or /* */
 fn_info_game_quakec() {
@@ -896,11 +920,11 @@ fn_info_game_armar() {
 # Filetype: con
 fn_info_game_bf1942() {
 	if [ -f "${servercfgfullpath}" ]; then
-		fn_info_game_keyvalue_pairs "configip" "game.serverIp"
-		fn_info_game_keyvalue_pairs "maxplayers" "game.serverMaxPlayers"
-		fn_info_game_keyvalue_pairs "port" "game.serverPort"
-		fn_info_game_keyvalue_pairs "servername" "game.serverName"
-		fn_info_game_keyvalue_pairs "serverpassword" "game.serverPassword"
+		fn_info_game_keyvalue_pairs_space "configip" "game.serverIP"
+		fn_info_game_keyvalue_pairs_space "maxplayers" "game.serverMaxPlayers"
+		fn_info_game_keyvalue_pairs_space "port" "game.serverPort"
+		fn_info_game_keyvalue_pairs_space "servername" "game.serverName"
+		fn_info_game_keyvalue_pairs_space "serverpassword" "game.serverPassword"
 	fi
 	configip="${configip:-"0.0.0.0"}"
 	maxplayers="${maxplayers:-"0"}"
@@ -917,11 +941,11 @@ fn_info_game_bf1942() {
 # Filetype: con
 fn_info_game_bfv() {
 	if [ -f "${servercfgfullpath}" ]; then
-		fn_info_game_keyvalue_pairs "configip" "game.serverIp"
-		fn_info_game_keyvalue_pairs "maxplayers" "game.serverMaxPlayers"
-		fn_info_game_keyvalue_pairs "port" "game.serverPort"
-		fn_info_game_keyvalue_pairs "servername" "game.serverName"
-		fn_info_game_keyvalue_pairs "serverpassword" "game.serverPassword"
+		fn_info_game_keyvalue_pairs_space "configip" "game.serverIp"
+		fn_info_game_keyvalue_pairs_space "maxplayers" "game.serverMaxPlayers"
+		fn_info_game_keyvalue_pairs_space "port" "game.serverPort"
+		fn_info_game_keyvalue_pairs_space "servername" "game.serverName"
+		fn_info_game_keyvalue_pairs_space "serverpassword" "game.serverPassword"
 	fi
 	configip="${configip:-"0.0.0.0"}"
 	maxplayers="${maxplayers:-"0"}"
@@ -1750,14 +1774,14 @@ fn_info_game_rust() {
 
 fn_info_game_rw() {
 	if [ -f "${servercfgfullpath}" ]; then
-		fn_info_game_keyvalue_pairs "configip" "Server_IP"
-		fn_info_game_keyvalue_pairs "gamemode" "World_GameMode"
-		fn_info_game_keyvalue_pairs "maxplayers" "Server_MaxPlayers"
-		fn_info_game_keyvalue_pairs "port" "Server_Port"
-		fn_info_game_keyvalue_pairs "rconport" "RCON_Port"
-		fn_info_game_keyvalue_pairs "seed" "World_Seed"
-		fn_info_game_keyvalue_pairs "servername" "Server_Name"
-		fn_info_game_keyvalue_pairs "worldname" "World_Name"
+		fn_info_game_keyvalue_pairs_equals "configip" "Server_IP"
+		fn_info_game_keyvalue_pairs_equals "gamemode" "World_GameMode"
+		fn_info_game_keyvalue_pairs_equals "maxplayers" "Server_MaxPlayers"
+		fn_info_game_keyvalue_pairs_equals "port" "Server_Port"
+		fn_info_game_keyvalue_pairs_equals "rconport" "RCON_Port"
+		fn_info_game_keyvalue_pairs_equals "seed" "World_Seed"
+		fn_info_game_keyvalue_pairs_equals "servername" "Server_Name"
+		fn_info_game_keyvalue_pairs_equals "worldname" "World_Name"
 	fi
 	configip="${configip:-"0.0.0.0"}"
 	gamemode="${gamemode:-"NOT SET"}"
@@ -1994,12 +2018,12 @@ fn_info_game_spark() {
 # Filetype: cfg
 fn_info_game_squad() {
 	if [ -f "${servercfgfullpath}" ]; then
-		fn_info_game_keyvalue_pairs "servername" "ServerName"
-		fn_info_game_keyvalue_pairs "maxplayers" "MaxPlayers"
+		fn_info_game_keyvalue_pairs_equals "servername" "ServerName"
+		fn_info_game_keyvalue_pairs_equals "maxplayers" "MaxPlayers"
 	fi
 	if [ -f "${servercfgdir}/Rcon.cfg" ]; then
-		fn_info_game_keyvalue_pairs "rconport" "Port" "${servercfgdir}/Rcon.cfg"
-		fn_info_game_keyvalue_pairs "rconpassword" "Password" "${servercfgdir}/Rcon.cfg"
+		fn_info_game_keyvalue_pairs_equals "rconport" "Port" "${servercfgdir}/Rcon.cfg"
+		fn_info_game_keyvalue_pairs_equals "rconpassword" "Password" "${servercfgdir}/Rcon.cfg"
 	fi
 	maxplayers="${maxplayers:-"0"}"
 	port="${port:-"0"}"
@@ -2017,10 +2041,10 @@ fn_info_game_squad() {
 # Filetype: cfg
 fn_info_game_terraria() {
 	if [ -f "${servercfgfullpath}" ]; then
-		fn_info_game_keyvalue_pairs "maxplayers" "maxplayers"
-		fn_info_game_keyvalue_pairs "port" "port"
-		fn_info_game_keyvalue_pairs "servername" "worldname"
-		fn_info_game_keyvalue_pairs "worldname" "world"
+		fn_info_game_keyvalue_pairs_equals "maxplayers" "maxplayers"
+		fn_info_game_keyvalue_pairs_equals "port" "port"
+		fn_info_game_keyvalue_pairs_equals "servername" "worldname"
+		fn_info_game_keyvalue_pairs_equals "worldname" "world"
 	fi
 	queryport="${port:-"0"}"
 	servername="${servername:-"NOT SET"}"

From a3c5a847e511bfe81f3072f3898d1fba9701ee6e Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 6 Sep 2023 15:20:07 +0100
Subject: [PATCH 18/33] fix(start): lock file created before check

Even if check fails a lock file will be generated to allow monitor to run
---
 lgsm/modules/command_start.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/modules/command_start.sh b/lgsm/modules/command_start.sh
index 963815b1b..b2f46855d 100644
--- a/lgsm/modules/command_start.sh
+++ b/lgsm/modules/command_start.sh
@@ -181,13 +181,13 @@ fn_start_tmux() {
 	echo -en "\n"
 }
 
-check.sh
-
 # If user ran the start command monitor will become enabled.
 if [ "${firstcommandname}" == "START" ] || [ "${firstcommandname}" == "RESTART" ]; then
 	date '+%s' > "${lockdir:?}/${selfname}-monitoring.lock"
 fi
 
+check.sh
+
 # If the server already started dont start again.
 if [ "${status}" != "0" ]; then
 	fn_print_dots "${servername}"

From 559365810774d433f6a60b214443eb3b6ec46f73 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 6 Sep 2023 15:41:39 +0100
Subject: [PATCH 19/33] fix(pvr): update executable details

PVR server has changed the name if its executable
---
 lgsm/config-default/config-lgsm/pvrserver/_default.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/pvrserver/_default.cfg b/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
index 53f0bdd03..22ef42b6a 100644
--- a/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
@@ -16,7 +16,7 @@ port="7777"
 defaultmap="datacenter"
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="${defaultmap} -log -MultiHome=${ip} -Port=${port}"
+startparameters="Pavlov ${defaultmap} -log -MultiHome=${ip} -Port=${port}"
 
 #### LinuxGSM Settings ####
 
@@ -163,7 +163,7 @@ glibc="2.17"
 ## Game Server Directories
 systemdir="${serverfiles}/Pavlov"
 executabledir="${systemdir}/Binaries/Linux"
-executable="./PavlovServer"
+executable="./PavlovServer-Linux-Shipping"
 servercfgdir="${systemdir}/Saved/Config/LinuxServer"
 servercfg="Game.ini"
 servercfgdefault="Game.ini"

From 89ec08c8f1f8a4be4f64a8decc28d56db043bb34 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 6 Sep 2023 16:40:34 +0100
Subject: [PATCH 20/33] fix(pvr): add fix for libc

---
 .../config-lgsm/pvrserver/_default.cfg             |  4 +++-
 .../config-lgsm/untserver/_default.cfg             |  1 +
 lgsm/modules/fix_ark.sh                            |  2 +-
 lgsm/modules/fix_arma3.sh                          |  2 +-
 lgsm/modules/fix_armar.sh                          |  2 +-
 lgsm/modules/fix_av.sh                             |  2 +-
 lgsm/modules/fix_bo.sh                             |  2 +-
 lgsm/modules/fix_bt.sh                             |  2 +-
 lgsm/modules/fix_cmw.sh                            |  2 +-
 lgsm/modules/fix_csgo.sh                           |  2 +-
 lgsm/modules/fix_dst.sh                            |  2 +-
 lgsm/modules/fix_hw.sh                             |  2 +-
 lgsm/modules/fix_ins.sh                            |  2 +-
 lgsm/modules/fix_kf.sh                             |  2 +-
 lgsm/modules/fix_kf2.sh                            |  2 +-
 lgsm/modules/fix_lo.sh                             |  2 +-
 lgsm/modules/fix_mcb.sh                            |  2 +-
 lgsm/modules/fix_mta.sh                            |  2 +-
 lgsm/modules/fix_pvr.sh                            | 14 ++++++++++++++
 lgsm/modules/fix_ro.sh                             |  2 +-
 lgsm/modules/fix_rust.sh                           |  2 +-
 lgsm/modules/fix_rw.sh                             |  2 +-
 lgsm/modules/fix_samp.sh                           |  2 +-
 lgsm/modules/fix_sdtd.sh                           |  2 +-
 lgsm/modules/fix_sfc.sh                            |  2 +-
 lgsm/modules/fix_sof2.sh                           |  2 +-
 lgsm/modules/fix_squad.sh                          |  2 +-
 lgsm/modules/fix_st.sh                             |  2 +-
 lgsm/modules/fix_steamcmd.sh                       |  2 +-
 lgsm/modules/fix_terraria.sh                       |  2 +-
 lgsm/modules/fix_tf2.sh                            |  2 +-
 lgsm/modules/fix_ts3.sh                            |  2 +-
 lgsm/modules/fix_unt.sh                            |  2 +-
 lgsm/modules/fix_ut.sh                             |  2 +-
 lgsm/modules/fix_ut2k4.sh                          |  2 +-
 lgsm/modules/fix_ut3.sh                            |  2 +-
 lgsm/modules/fix_vh.sh                             |  2 +-
 lgsm/modules/fix_wurm.sh                           |  2 +-
 lgsm/modules/fix_zmr.sh                            |  2 +-
 39 files changed, 54 insertions(+), 37 deletions(-)
 create mode 100644 lgsm/modules/fix_pvr.sh

diff --git a/lgsm/config-default/config-lgsm/pvrserver/_default.cfg b/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
index 22ef42b6a..0a0bf8b52 100644
--- a/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
@@ -14,9 +14,11 @@ port="7777"
 
 # Maps: bridge, datacenter, sand
 defaultmap="datacenter"
+# Get an API key from https://pavlov-ms.vankrupt.com/servers/v1/key
+apikey=""
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="Pavlov ${defaultmap} -log -MultiHome=${ip} -Port=${port}"
+startparameters="Pavlov ${defaultmap} -log -MultiHome=${ip} -Port=${port} ApiKey=${apikey}"
 
 #### LinuxGSM Settings ####
 
diff --git a/lgsm/config-default/config-lgsm/untserver/_default.cfg b/lgsm/config-default/config-lgsm/untserver/_default.cfg
index f5aa19e5b..8fc651294 100644
--- a/lgsm/config-default/config-lgsm/untserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/untserver/_default.cfg
@@ -16,6 +16,7 @@ defaultmap="PEI"
 servername="LinuxGSM"
 perspective="first" # Values: first, third, vehicle, Both.
 gamemode="normal" # Values: normal, easy, gold.
+
 ## Game Server Login Token (GSLT): Required
 # GSLT is required for running a public server.
 # More info: https://docs.linuxgsm.com/steamcmd/gslt
diff --git a/lgsm/modules/fix_ark.sh b/lgsm/modules/fix_ark.sh
index 7ca0e60f8..03e53380f 100644
--- a/lgsm/modules/fix_ark.sh
+++ b/lgsm/modules/fix_ark.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with ARK: Survival Evolved.
+# Description: Resolves issues with ARK: Survival Evolved.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_arma3.sh b/lgsm/modules/fix_arma3.sh
index d41738377..b415b81d6 100644
--- a/lgsm/modules/fix_arma3.sh
+++ b/lgsm/modules/fix_arma3.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves an issue with ARMA3.
+# Description: Resolves issues with ARMA3.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_armar.sh b/lgsm/modules/fix_armar.sh
index 2a56daf41..6b68c2a63 100755
--- a/lgsm/modules/fix_armar.sh
+++ b/lgsm/modules/fix_armar.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves an issue with Arma Reforger.
+# Description: Resolves issues with Arma Reforger.
 
 module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_av.sh b/lgsm/modules/fix_av.sh
index c8fcdcfc5..fbb259900 100644
--- a/lgsm/modules/fix_av.sh
+++ b/lgsm/modules/fix_av.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves startup issue with Avorion
+# Description: Resolves issues with Avorion.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_bo.sh b/lgsm/modules/fix_bo.sh
index 3e09a880f..24e76874e 100644
--- a/lgsm/modules/fix_bo.sh
+++ b/lgsm/modules/fix_bo.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Ballistic Overkill.
+# Description: Resolves issues with Ballistic Overkill.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_bt.sh b/lgsm/modules/fix_bt.sh
index bb26155d8..4d837a1ba 100755
--- a/lgsm/modules/fix_bt.sh
+++ b/lgsm/modules/fix_bt.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves an issue with Barotrauma.
+# Description: Resolves issues with Barotrauma.
 
 module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_cmw.sh b/lgsm/modules/fix_cmw.sh
index 2a98d9e53..a57c6c8cb 100644
--- a/lgsm/modules/fix_cmw.sh
+++ b/lgsm/modules/fix_cmw.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves the issue of the not starting server on linux
+# Description: Resolves issues with Chivalry: Medieval Warfare.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_csgo.sh b/lgsm/modules/fix_csgo.sh
index 01b02c4e0..ea858ee3c 100644
--- a/lgsm/modules/fix_csgo.sh
+++ b/lgsm/modules/fix_csgo.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with CS:GO.
+# Description: Resolves issues with Counter-Strike: Global Offensive.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_dst.sh b/lgsm/modules/fix_dst.sh
index e1f07dcb6..ff963d342 100644
--- a/lgsm/modules/fix_dst.sh
+++ b/lgsm/modules/fix_dst.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Don't Starve Together.
+# Description: Resolves issues with Don't Starve Together.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_hw.sh b/lgsm/modules/fix_hw.sh
index 6a92a5c04..0e70b7195 100644
--- a/lgsm/modules/fix_hw.sh
+++ b/lgsm/modules/fix_hw.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Hurtworld.
+# Description: Resolves issues with Hurtworld.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_ins.sh b/lgsm/modules/fix_ins.sh
index 21bea123a..cc79e3685 100644
--- a/lgsm/modules/fix_ins.sh
+++ b/lgsm/modules/fix_ins.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Insurgency.
+# Description: Resolves issues with Insurgency.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_kf.sh b/lgsm/modules/fix_kf.sh
index 3cfb8fd84..fe8b574aa 100644
--- a/lgsm/modules/fix_kf.sh
+++ b/lgsm/modules/fix_kf.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Killing Floor.
+# Description: Resolves issues with Killing Floor.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_kf2.sh b/lgsm/modules/fix_kf2.sh
index 7be311b4f..46850bd64 100644
--- a/lgsm/modules/fix_kf2.sh
+++ b/lgsm/modules/fix_kf2.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Killing Floor 2.
+# Description: Resolves issues with Killing Floor 2.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_lo.sh b/lgsm/modules/fix_lo.sh
index a04248867..4c3758b01 100644
--- a/lgsm/modules/fix_lo.sh
+++ b/lgsm/modules/fix_lo.sh
@@ -2,7 +2,7 @@
 # LinuxGSM fix_lo.sh module
 # Author: Daniel Gibbs
 # Website: https://linuxgsm.com
-# Description: Resolves installation issue with Last Oasis
+# Description: Resolves various issues with Last Oasis.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_mcb.sh b/lgsm/modules/fix_mcb.sh
index 828225e72..1e95bb4a8 100644
--- a/lgsm/modules/fix_mcb.sh
+++ b/lgsm/modules/fix_mcb.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves possible startup issue with Minecraft Bedrock.
+# Description: Resolves various issues with Minecraft Bedrock.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_mta.sh b/lgsm/modules/fix_mta.sh
index 21292d7f3..65488f2a1 100644
--- a/lgsm/modules/fix_mta.sh
+++ b/lgsm/modules/fix_mta.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Installs the libmysqlclient for database functions on the server.
+# Description: Resolves various issues with Multi Theft Auto.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_pvr.sh b/lgsm/modules/fix_pvr.sh
new file mode 100644
index 000000000..6d8727e33
--- /dev/null
+++ b/lgsm/modules/fix_pvr.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# LinuxGSM fix_pvr.sh module
+# Author: Daniel Gibbs
+# Contributors: http://linuxgsm.com/contrib
+# Website: https://linuxgsm.com
+# Description: Resolves various issues with Pavlov VR.
+
+moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+
+if [ ! -f "${serverfiles}/linux64/libc++.so" ] && [ -f "/usr/lib/x86_64-linux-gnu/libc++.so.1" ]; then
+	cp "/usr/lib/x86_64-linux-gnu/libc++.so.1" "${serverfiles}/linux64/libc++.so"
+fi
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}:${serverfiles}/linux64"
diff --git a/lgsm/modules/fix_ro.sh b/lgsm/modules/fix_ro.sh
index f094c6b38..6ae485dbe 100644
--- a/lgsm/modules/fix_ro.sh
+++ b/lgsm/modules/fix_ro.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Red Orchestra.
+# Description: Resolves issues with Red Orchestra.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_rust.sh b/lgsm/modules/fix_rust.sh
index 0699a8f00..6d4cebc01 100644
--- a/lgsm/modules/fix_rust.sh
+++ b/lgsm/modules/fix_rust.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves startup issue with Rust.
+# Description: Resolves issues with Rust.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_rw.sh b/lgsm/modules/fix_rw.sh
index 2cc631122..17acf4def 100644
--- a/lgsm/modules/fix_rw.sh
+++ b/lgsm/modules/fix_rw.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Rising World.
+# Description: Resolves issues with Rising World.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_samp.sh b/lgsm/modules/fix_samp.sh
index 146fc37af..461d92aee 100644
--- a/lgsm/modules/fix_samp.sh
+++ b/lgsm/modules/fix_samp.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves issue that the default rcon password is not changed
+# Description: Resolves issue that the default rcon password is not changed.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_sdtd.sh b/lgsm/modules/fix_sdtd.sh
index e46f7db8c..7988b0d67 100644
--- a/lgsm/modules/fix_sdtd.sh
+++ b/lgsm/modules/fix_sdtd.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with 7 Days to Die.
+# Description: Resolves issues with 7 Days to Die.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_sfc.sh b/lgsm/modules/fix_sfc.sh
index 891b71803..308f74b24 100644
--- a/lgsm/modules/fix_sfc.sh
+++ b/lgsm/modules/fix_sfc.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Source Forts Classic.
+# Description: Resolves issues with Source Forts Classic.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_sof2.sh b/lgsm/modules/fix_sof2.sh
index 43d943cb1..4e5b13624 100644
--- a/lgsm/modules/fix_sof2.sh
+++ b/lgsm/modules/fix_sof2.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Soldier of Fortune 2.
+# Description: Resolves issues with Soldier of Fortune 2.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_squad.sh b/lgsm/modules/fix_squad.sh
index e7162d310..2fec57f0e 100644
--- a/lgsm/modules/fix_squad.sh
+++ b/lgsm/modules/fix_squad.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Squad.
+# Description: Resolves issues with Squad.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_st.sh b/lgsm/modules/fix_st.sh
index 44066bb37..4d100c6fc 100644
--- a/lgsm/modules/fix_st.sh
+++ b/lgsm/modules/fix_st.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves startup issue with Stationeers.
+# Description: Resolves issues with Stationeers.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_steamcmd.sh b/lgsm/modules/fix_steamcmd.sh
index 44980ab32..2a2076072 100644
--- a/lgsm/modules/fix_steamcmd.sh
+++ b/lgsm/modules/fix_steamcmd.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues related to SteamCMD.
+# Description: Resolves issues with SteamCMD.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_terraria.sh b/lgsm/modules/fix_terraria.sh
index 7e5aa67e2..dc734b6fd 100644
--- a/lgsm/modules/fix_terraria.sh
+++ b/lgsm/modules/fix_terraria.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves an issue with Terraria.
+# Description: Resolves issues with Terraria.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_tf2.sh b/lgsm/modules/fix_tf2.sh
index 085542eed..fe7de8278 100644
--- a/lgsm/modules/fix_tf2.sh
+++ b/lgsm/modules/fix_tf2.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Team Fortress 2.
+# Description: Resolves issues with Team Fortress 2.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_ts3.sh b/lgsm/modules/fix_ts3.sh
index 3d0a6760f..c655a4322 100644
--- a/lgsm/modules/fix_ts3.sh
+++ b/lgsm/modules/fix_ts3.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Teamspeak 3.
+# Description: Resolves issues with Teamspeak 3.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_unt.sh b/lgsm/modules/fix_unt.sh
index 77253bd85..9afdce337 100644
--- a/lgsm/modules/fix_unt.sh
+++ b/lgsm/modules/fix_unt.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves startup issue with Unturned.
+# Description: Resolves issues with Unturned.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_ut.sh b/lgsm/modules/fix_ut.sh
index aa958e86d..ded65ddad 100644
--- a/lgsm/modules/fix_ut.sh
+++ b/lgsm/modules/fix_ut.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Unreal Tournament.
+# Description: Resolves issues with Unreal Tournament.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_ut2k4.sh b/lgsm/modules/fix_ut2k4.sh
index 0a3b89b33..2f7fc0d4d 100644
--- a/lgsm/modules/fix_ut2k4.sh
+++ b/lgsm/modules/fix_ut2k4.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Unreal Tournament 2004.
+# Description: Resolves issues with Unreal Tournament 2004.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_ut3.sh b/lgsm/modules/fix_ut3.sh
index 4958537f2..97326c786 100644
--- a/lgsm/modules/fix_ut3.sh
+++ b/lgsm/modules/fix_ut3.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Unreal Tournament 3.
+# Description: Resolves issues with Unreal Tournament 3.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_vh.sh b/lgsm/modules/fix_vh.sh
index 984907747..831335c3c 100644
--- a/lgsm/modules/fix_vh.sh
+++ b/lgsm/modules/fix_vh.sh
@@ -2,7 +2,7 @@
 # LinuxGSM fix_rust.sh module
 # Author: Alasdair Haig
 # Website: https://linuxgsm.com
-# Description: Resolves startup issue with Valheim
+# Description: Resolves issues with Valheim,
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_wurm.sh b/lgsm/modules/fix_wurm.sh
index 73eaac93e..b6f5762f5 100644
--- a/lgsm/modules/fix_wurm.sh
+++ b/lgsm/modules/fix_wurm.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Wurm Unlimited.
+# Description: Resolves issues with Wurm Unlimited.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/fix_zmr.sh b/lgsm/modules/fix_zmr.sh
index 56f055fc3..a88d82f34 100644
--- a/lgsm/modules/fix_zmr.sh
+++ b/lgsm/modules/fix_zmr.sh
@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Resolves various issues with Zombie Master: Reborn.
+# Description: Resolves issues with Zombie Master: Reborn.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 

From 3959fa4bf46d43998fa5e34332846ee1346949d1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 6 Sep 2023 19:22:23 +0100
Subject: [PATCH 21/33] fix(pstbs): correct gamename

---
 lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
index 513f9e089..d028fad57 100644
--- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
@@ -155,7 +155,7 @@ consoleinteract="no"
 
 ## Game Server Details
 # Do not edit
-gamename="pstbsserver"
+gamename="Post Scriptum"
 engine="unreal4"
 glibc="2.17"
 

From 20f5e8d5dcaa8cb0d80044fcd80ccf11678063c4 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 6 Sep 2023 19:27:05 +0100
Subject: [PATCH 22/33] feat(ps): Renamed pstbs to ps

Post Scriptum changed is name removing "The Bloody Seventh" part. I have updated the naming of this game server.
---
 lgsm/data/almalinux-8.csv                 | 2 +-
 lgsm/data/almalinux-9.csv                 | 2 +-
 lgsm/data/centos-7.csv                    | 2 +-
 lgsm/data/centos-8.csv                    | 2 +-
 lgsm/data/centos-9.csv                    | 2 +-
 lgsm/data/debian-10.csv                   | 2 +-
 lgsm/data/debian-11.csv                   | 2 +-
 lgsm/data/debian-12.csv                   | 2 +-
 lgsm/data/debian-9.csv                    | 2 +-
 lgsm/data/rhel-7.csv                      | 2 +-
 lgsm/data/rhel-8.csv                      | 2 +-
 lgsm/data/rhel-9.csv                      | 2 +-
 lgsm/data/rocky-8.csv                     | 2 +-
 lgsm/data/rocky-9.csv                     | 2 +-
 lgsm/data/serverlist.csv                  | 2 +-
 lgsm/data/ubuntu-16.04.csv                | 2 +-
 lgsm/data/ubuntu-18.04.csv                | 2 +-
 lgsm/data/ubuntu-20.04.csv                | 2 +-
 lgsm/data/ubuntu-22.04.csv                | 2 +-
 lgsm/data/ubuntu-23.04.csv                | 2 +-
 lgsm/modules/check_system_requirements.sh | 2 +-
 lgsm/modules/info_game.sh                 | 6 +++---
 lgsm/modules/info_messages.sh             | 6 +++---
 23 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
index 78ee5945d..ac4b7c36f 100644
--- a/lgsm/data/almalinux-8.csv
+++ b/lgsm/data/almalinux-8.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv
index b341b7282..124322b62 100644
--- a/lgsm/data/almalinux-9.csv
+++ b/lgsm/data/almalinux-9.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
index 616e61c32..4c256491d 100644
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-11-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
index 78ee5945d..ac4b7c36f 100644
--- a/lgsm/data/centos-8.csv
+++ b/lgsm/data/centos-8.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv
index b341b7282..124322b62 100644
--- a/lgsm/data/centos-9.csv
+++ b/lgsm/data/centos-9.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/debian-10.csv b/lgsm/data/debian-10.csv
index fd29e6da3..d2602643f 100644
--- a/lgsm/data/debian-10.csv
+++ b/lgsm/data/debian-10.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-11-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-11-jre,rng-tools
diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv
index 6f34e2832..16c6e6b81 100644
--- a/lgsm/data/debian-11.csv
+++ b/lgsm/data/debian-11.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-17-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-17-jre,rng-tools
diff --git a/lgsm/data/debian-12.csv b/lgsm/data/debian-12.csv
index 3738c4749..04ff25b7a 100644
--- a/lgsm/data/debian-12.csv
+++ b/lgsm/data/debian-12.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-17-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-17-jre,rng-tools5
diff --git a/lgsm/data/debian-9.csv b/lgsm/data/debian-9.csv
index 794a54afe..e3143955f 100644
--- a/lgsm/data/debian-9.csv
+++ b/lgsm/data/debian-9.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-8-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-8-jre,rng-tools
diff --git a/lgsm/data/rhel-7.csv b/lgsm/data/rhel-7.csv
index 1b0b8c1bd..ac272c917 100644
--- a/lgsm/data/rhel-7.csv
+++ b/lgsm/data/rhel-7.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-11-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv
index 78ee5945d..ac4b7c36f 100644
--- a/lgsm/data/rhel-8.csv
+++ b/lgsm/data/rhel-8.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/rhel-9.csv b/lgsm/data/rhel-9.csv
index b341b7282..124322b62 100644
--- a/lgsm/data/rhel-9.csv
+++ b/lgsm/data/rhel-9.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv
index 78ee5945d..ac4b7c36f 100644
--- a/lgsm/data/rocky-8.csv
+++ b/lgsm/data/rocky-8.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv
index b341b7282..124322b62 100644
--- a/lgsm/data/rocky-9.csv
+++ b/lgsm/data/rocky-9.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-pstbs,GConf2
+ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
index 8c3d7cf61..7872048c7 100644
--- a/lgsm/data/serverlist.csv
+++ b/lgsm/data/serverlist.csv
@@ -82,7 +82,7 @@ opfor,opforserver,Opposing Force,ubuntu-22.04
 pc,pcserver,Project Cars,ubuntu-22.04
 pc2,pc2server,Project Cars 2,ubuntu-22.04
 pmc,pmcserver,PaperMC,ubuntu-22.04
-pstbs,pstbsserver,Post Scriptum: The Bloody Seventh,ubuntu-22.04
+ps,psserver,Post Scriptum,ubuntu-22.04
 pvkii,pvkiiserver,Pirates Vikings & Knights II,ubuntu-22.04
 pvr,pvrserver,Pavlov VR,ubuntu-22.04
 pz,pzserver,Project Zomboid,ubuntu-22.04
diff --git a/lgsm/data/ubuntu-16.04.csv b/lgsm/data/ubuntu-16.04.csv
index 0fac4905f..51b2d929a 100644
--- a/lgsm/data/ubuntu-16.04.csv
+++ b/lgsm/data/ubuntu-16.04.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-8-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-8-jre,rng-tools
diff --git a/lgsm/data/ubuntu-18.04.csv b/lgsm/data/ubuntu-18.04.csv
index fd29e6da3..d2602643f 100644
--- a/lgsm/data/ubuntu-18.04.csv
+++ b/lgsm/data/ubuntu-18.04.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-11-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-11-jre,rng-tools
diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
index a51acccd0..8eadea652 100644
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-17-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-17-jre,rng-tools
diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
index 7f417b463..463a819ae 100644
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-17-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-17-jre,rng-tools5
diff --git a/lgsm/data/ubuntu-23.04.csv b/lgsm/data/ubuntu-23.04.csv
index 7f417b463..463a819ae 100644
--- a/lgsm/data/ubuntu-23.04.csv
+++ b/lgsm/data/ubuntu-23.04.csv
@@ -83,7 +83,7 @@ opfor
 pc
 pc2
 pmc,openjdk-17-jre
-pstbs,libgconf-2-4
+ps,libgconf-2-4
 pvkii
 pvr,libc++1
 pz,openjdk-17-jre,rng-tools5
diff --git a/lgsm/modules/check_system_requirements.sh b/lgsm/modules/check_system_requirements.sh
index 114292f46..88fb9d15a 100644
--- a/lgsm/modules/check_system_requirements.sh
+++ b/lgsm/modules/check_system_requirements.sh
@@ -29,7 +29,7 @@ elif [ "${shortname}" == "rust" ]; then
 elif [ "${shortname}" == "mc" ] || [ "${shortname}" == "pmc" ] || [ "${shortname}" == "wmc" ]; then
 	ramrequirementmb="1000"
 	ramrequirementgb="1"
-elif [ "${shortname}" == "pstbs" ]; then
+elif [ "${shortname}" == "ps" ]; then
 	ramrequirementmb="2000"
 	ramrequirementgb="2"
 elif [ "${shortname}" == "ns2" ] || [ "${shortname}" == "ns2c" ]; then
diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh
index dbce9e203..5c0867029 100644
--- a/lgsm/modules/info_game.sh
+++ b/lgsm/modules/info_game.sh
@@ -567,7 +567,7 @@ fn_info_game_mh() {
 # Comment: ; or #
 # Example: ServerName="SERVERNAME"
 # Filetype: cfg
-fn_info_game_pstbs() {
+fn_info_game_ps() {
 	if [ -f "${servercfgfullpath}" ]; then
 		fn_info_game_ini "servername" "ServerName"
 		fn_info_game_ini "maxplayers" "MaxPlayers"
@@ -2312,8 +2312,8 @@ elif [ "${shortname}" == "pc" ]; then
 	fn_info_game_pc
 elif [ "${shortname}" == "pc2" ]; then
 	fn_info_game_pc2
-elif [ "${shortname}" == "pstbs" ]; then
-	fn_info_game_pstbs
+elif [ "${shortname}" == "ps" ]; then
+	fn_info_game_ps
 elif [ "${shortname}" == "pvr" ]; then
 	fn_info_game_pvr
 elif [ "${shortname}" == "pz" ]; then
diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh
index 22319cdbd..6d8b849c5 100644
--- a/lgsm/modules/info_messages.sh
+++ b/lgsm/modules/info_messages.sh
@@ -1252,7 +1252,7 @@ fn_info_message_pc2() {
 	} | column -s $'\t' -t
 }
 
-fn_info_message_pstbs() {
+fn_info_message_ps() {
 	{
 		fn_port "header"
 		fn_port "Game" port udp
@@ -1777,8 +1777,8 @@ fn_info_message_select_engine() {
 		fn_info_message_pc
 	elif [ "${shortname}" == "pc2" ]; then
 		fn_info_message_pc2
-	elif [ "${shortname}" == "pstbs" ]; then
-		fn_info_message_pstbs
+	elif [ "${shortname}" == "ps" ]; then
+		fn_info_message_ps
 	elif [ "${shortname}" == "pvr" ]; then
 		fn_info_message_pvr
 	elif [ "${shortname}" == "pz" ]; then

From 8cd16acfd07378791fdb79686c78d95e6d9232d0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 6 Sep 2023 22:01:09 +0100
Subject: [PATCH 23/33] fix: make pgrep unique

- Refactored the code to use `pgrep -fcx` instead of `pgrep -fc` for checking process counts.
- Updated print statements to provide more informative messages.
- Renamed some variables for clarity.
- Added newlines after printing information.
---
 lgsm/modules/command_monitor.sh | 68 ++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh
index c64df9fda..3c929fb20 100644
--- a/lgsm/modules/command_monitor.sh
+++ b/lgsm/modules/command_monitor.sh
@@ -26,69 +26,69 @@ fn_monitor_check_monitoring() {
 }
 
 fn_monitor_check_install() {
-	if [ "$(pgrep -fc -u "${USER}" "${selfname} install")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} i")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} auto-install")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} ai")" != "0" ]; then
+	if [ "$(pgrep -fc -u "${USER}" "/bin/bash ./${selfname} install")" != "0" ] || [ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} i")" != "0" ] || [ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} auto-install")" != "0" ] || [ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} ai")" != "0" ]; then
 		fn_print_dots "Checking installer: "
 		fn_print_checking_eol
 		fn_script_log_info "Checking installer: CHECKING"
-		fn_print_info "Checking installer: Installer is : "
-		fn_print_info_eol
+		fn_print_info "Checking installer: LinuxGSM is installing: "
+		fn_print_info_eol_nl
 		fn_script_log_pass "Checking installer: LinuxGSM is installing"
 		core_exit.sh
 	fi
 }
 
 fn_monitor_check_debug() {
-	if [ "$(pgrep -fc -u "${USER}" "${selfname} debug")" != "0" ] || [ "$(pgrep -fc -u "${USER}" "${selfname} d")" != "0" ]; then
+	if [ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} debug")" != "0" ] || [ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} d")" != "0" ]; then
 		fn_print_dots "Checking debug: "
 		fn_print_checking_eol
 		fn_print_info "Checking debug: Debug is running: "
-		fn_print_info_eol
+		fn_print_info_eol_nl
 		fn_script_log_pass "Checking debug: Debug is running"
 		core_exit.sh
 	fi
 }
 
-fn_monitor_check_starting(){
+fn_monitor_check_starting() {
 	# Remove stale lockfile.
 	if [ -f "${lockdir}/${selfname}-starting.lock" ]; then
 		if [ "$(find "${lockdir}/${selfname}-starting.lock" -mmin +5)" ]; then
 			fn_print_dots "Checking start: "
 			fn_print_checking_eol
 			fn_print_warn "Checking start: Removing stale lockfile: "
-			fn_print_warn_eol
+			fn_print_warn_eol_nl
 			fn_script_log_warn "Checking start: Removing stale lockfile"
 			rm -f "${lockdir:?}/${selfname}-starting.lock"
 		fi
 	fi
 
-	if [ -f "${lockdir}/${selfname}-starting.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} start")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} s")" != "0" ]]; then
+	if [ -f "${lockdir}/${selfname}-starting.lock" ] && [[ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} start")" != "0" || "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} s")" != "0" ]]; then
 		fn_print_dots "Checking start: "
 		fn_print_checking_eol
 		fn_print_info "Checking start: LinuxGSM is starting: "
-		fn_print_info_eol
+		fn_print_info_eol_nl
 		fn_script_log_info "Checking backup: LinuxGSM is starting"
 		core_exit.sh
 	fi
 }
 
-fn_monitor_check_stopping(){
+fn_monitor_check_stopping() {
 	# Remove stale lockfile.
 	if [ -f "${lockdir}/${selfname}-stopping.lock" ]; then
 		if [ "$(find "${lockdir}/${selfname}-stopping.lock" -mmin +5)" ]; then
 			fn_print_dots "Checking stop: "
 			fn_print_checking_eol
 			fn_print_warn "Checking stop: Removing stale lockfile: "
-			fn_print_warn_eol
+			fn_print_warn_eol_nl
 			fn_script_log_warn "Checking stop: Removing stale lockfile"
 			rm -f "${lockdir:?}/${selfname}-stopping.lock"
 		fi
 	fi
 
-	if [ -f "${lockdir}/${selfname}-stopping.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} stop")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} s")" != "0" ]]; then
+	if [ -f "${lockdir}/${selfname}-stopping.lock" ] && [[ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} stop")" != "0" || "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} s")" != "0" ]]; then
 		fn_print_dots "Checking stop: "
 		fn_print_checking_eol
 		fn_print_info "Checking stop: LinuxGSM is stopping: "
-		fn_print_info_eol
+		fn_print_info_eol_nl
 		fn_script_log_info "Checking backup: LinuxGSM is stopping"
 		core_exit.sh
 	fi
@@ -107,11 +107,11 @@ fn_monitor_check_backup() {
 		fi
 	fi
 
-	if [ -f "${lockdir}/backup.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} backup")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} b")" != "0" ]]; then
+	if [ -f "${lockdir}/backup.lock" ] && [[ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} backup")" != "0" || "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} b")" != "0" ]]; then
 		fn_print_dots "Checking backup: "
 		fn_print_checking_eol
 		fn_print_info "Checking backup: Backup is running: "
-		fn_print_info_eol
+		fn_print_info_eol_nl
 		fn_script_log_info "Checking backup: Backup is running"
 		core_exit.sh
 	fi
@@ -124,38 +124,38 @@ fn_monitor_check_update() {
 			fn_print_dots "Checking update: "
 			fn_print_checking_eol
 			fn_print_warn "Checking update: Removing stale lockfile: "
-			fn_print_warn_eol
+			fn_print_warn_eol_nl
 			fn_script_log_warn "Checking update: Removing stale lockfile"
 			rm -f "${lockdir:?}/update.lock"
 		fi
 	fi
 
-	if [ -f "${lockdir}/update.lock" ] && [[ "$(pgrep -fc -u "${USER}" "${selfname} update")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} validate")" != "0" || "$(pgrep -fc -u "${USER}" "${selfname} v")" != "0" || "$(pgrep -fc force-update "${USER}" "${selfname} fu")" != "0" ]]; then
+	if [ -f "${lockdir}/update.lock" ] && [[ "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} update")" != "0" || "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} validate")" != "0" || "$(pgrep -fcx -u "${USER}" "/bin/bash ./${selfname} v")" != "0" || "$(pgrep -fc force-update "${USER}" "/bin/bash ./${selfname} fu")" != "0" ]]; then
 		fn_print_dots "Checking update: "
 		fn_print_checking_eol
 		fn_print_info "Checking update: LinuxGSM is updating the game server: "
-		fn_print_info_eol
+		fn_print_info_eol_nl
 		fn_script_log_pass "Checking update: LinuxGSM is updating the game server"
 		core_exit.sh
 	fi
 }
 
 # Source engine games may display a messages to indicate the server needs restarting.
-fn_monitor_check_update_source(){
- if [ -f "${consolelogdir}/${selfname}-console.log" ] && [ "${engine}" == "source" ]; then
-	 if grep -q "Your server needs to be restarted in order to receive the latest update." "${consolelogdir}/${selfname}-console.log"; then
-		 fn_print_dots "Checking update: "
-		 fn_print_checking_eol
-		 fn_script_log_info "Checking update: CHECKING"
-		 fn_print_ok "Checking update: "
-		 fn_print_ok_eol_nl
-		 fn_script_log_info "Checking update: Monitor is restarting ${selfname} to apply update"
-		 alert="restart"
-		 alert.sh
-		 command_restart.sh
-		 core_exit.sh
-	 fi
- fi
+fn_monitor_check_update_source() {
+	if [ -f "${consolelogdir}/${selfname}-console.log" ] && [ "${engine}" == "source" ]; then
+		if grep -q "Your server needs to be restarted in order to receive the latest update." "${consolelogdir}/${selfname}-console.log"; then
+			fn_print_dots "Checking update: "
+			fn_print_checking_eol
+			fn_script_log_info "Checking update: CHECKING"
+			fn_print_ok "Checking update: "
+			fn_print_ok_eol_nl
+			fn_script_log_info "Checking update: Monitor is restarting ${selfname} to apply update"
+			alert="restart"
+			alert.sh
+			command_restart.sh
+			core_exit.sh
+		fi
+	fi
 }
 
 fn_monitor_check_session() {
@@ -166,7 +166,7 @@ fn_monitor_check_session() {
 	sessionwidth="80"
 	sessionheight="23"
 	# Check for PIDS with identical tmux sessions running.
-	if [ "$(pgrep -fc "tmux -L ${socketname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" -ge "2" ]; then
+	if [ "$(pgrep -fcx "tmux -L ${socketname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" -ge "2" ]; then
 		fn_print_error "Checking session: "
 		fn_print_error_eol_nl
 		fn_script_log_error "Checking session: ERROR"

From ca184e32e3e0ddffae40da6bbf48637ac9a39c2d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 7 Sep 2023 21:23:31 +0100
Subject: [PATCH 24/33] fix(monitor): migration code

---
 lgsm/modules/command_monitor.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh
index 3c929fb20..192897bfd 100644
--- a/lgsm/modules/command_monitor.sh
+++ b/lgsm/modules/command_monitor.sh
@@ -12,8 +12,12 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 fn_firstcommand_set
 
 fn_monitor_check_monitoring() {
-	# Monitor does not run if lockfile is not found.
-	if [ ! -f "${lockdir}/${selfname}-monitoring.lock" ]; then
+	if [ -f "${lockdir}/${selfname}.lock" ]; then
+		# Part of migration to v23.5.0. #4296
+		rm -f "${lockdir:?}/${selfname}.lock"
+		date '+%s' > "${lockdir:?}/${selfname}-monitoring.lock"
+	elif [ ! -f "${lockdir}/${selfname}-monitoring.lock" ]; then
+		# Monitor does not run if lockfile is not found.
 		fn_print_dots "Checking lockfile: "
 		fn_print_checking_eol
 		fn_script_log_info "Checking lockfile: CHECKING"
@@ -167,7 +171,7 @@ fn_monitor_check_session() {
 	sessionheight="23"
 	# Check for PIDS with identical tmux sessions running.
 	if [ "$(pgrep -fcx "tmux -L ${socketname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" -ge "2" ]; then
-		fn_print_error "Checking session: "
+		fn_print_error "Checking session: There are PIDS with identical tmux sessions running: "
 		fn_print_error_eol_nl
 		fn_script_log_error "Checking session: ERROR"
 		fn_script_log_error "Checking session: There are PIDS with identical tmux sessions running"
@@ -177,7 +181,7 @@ fn_monitor_check_session() {
 		core_exit.sh
 	# Check for tmux pids with the same tmux session and socket names. This will reduce issues with migration to release v23.5.0. #4296
 	elif [ "$(pgrep -fc -u "${USER}" "tmux -L ${sessionname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" != "0" ]; then
-		fn_print_error "Checking session: "
+		fn_print_error "Checking session: PIDS with the same tmux session and socket names are running: "
 		fn_print_error_eol_nl
 		fn_script_log_error "Checking session: ERROR"
 		fn_script_log_error "Checking session: PIDS with the same tmux session and socket names are running"

From fe610f3ec96a17dce287129a34add47851ae04c8 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 7 Sep 2023 21:25:20 +0100
Subject: [PATCH 25/33] feat(inss): enable master server checking

---
 lgsm/config-default/config-lgsm/inssserver/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index 820058ada..076b61ecb 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -132,7 +132,7 @@ steamcmdforcewindows="no"
 branch=""
 betapassword=""
 # Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
-steammaster="false"
+steammaster="true"
 
 ## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
 # 1: tmux kill

From 16c4493d1d63817ad12dd9f7741b80dca8e975a7 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 7 Sep 2023 22:43:59 +0100
Subject: [PATCH 26/33] fix(monitor): migration code

---
 lgsm/modules/alert.sh           | 11 +++++++++++
 lgsm/modules/command_monitor.sh | 13 ++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lgsm/modules/alert.sh b/lgsm/modules/alert.sh
index c7ed897f9..03d672a66 100644
--- a/lgsm/modules/alert.sh
+++ b/lgsm/modules/alert.sh
@@ -72,6 +72,15 @@ fn_alert_check_update() {
 	alertbody="${gamename} update available: ${remotebuildversion}"
 }
 
+fn_alert_update_restart() {
+	fn_script_log_info "Sending alert: Restarted"
+	alertsubject="Alert - ${selfname} - Restarted"
+	alertemoji="🎮"
+	alertsound="1"
+	alerturl="not enabled"
+	alertbody="${gamename} received update: ${remotebuildversion} and required restarting"
+}
+
 fn_alert_permissions() {
 	fn_script_log_info "Sending alert: Permissions error"
 	alertsubject="Alert - ${selfname}: Permissions error"
@@ -102,6 +111,8 @@ elif [ "${alert}" == "update" ]; then
 	fn_alert_update
 elif [ "${alert}" == "check-update" ]; then
 	fn_alert_check_update
+elif [ "${alert}" == "update-restart" ]; then
+	fn_alert_update_restart
 elif [ "${alert}" == "config" ]; then
 	fn_alert_config
 fi
diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh
index 192897bfd..b1d9b5f6d 100644
--- a/lgsm/modules/command_monitor.sh
+++ b/lgsm/modules/command_monitor.sh
@@ -154,7 +154,7 @@ fn_monitor_check_update_source() {
 			fn_print_ok "Checking update: "
 			fn_print_ok_eol_nl
 			fn_script_log_info "Checking update: Monitor is restarting ${selfname} to apply update"
-			alert="restart"
+			alert="update-restart"
 			alert.sh
 			command_restart.sh
 			core_exit.sh
@@ -177,7 +177,6 @@ fn_monitor_check_session() {
 		fn_script_log_error "Checking session: There are PIDS with identical tmux sessions running"
 		fn_script_log_error "Checking session: Killing all tmux sessions with the socketname name ${socketname} and session name ${sessionname}"
 		pkill -f "tmux -L ${socketname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
-		command_restart.sh
 		core_exit.sh
 	# Check for tmux pids with the same tmux session and socket names. This will reduce issues with migration to release v23.5.0. #4296
 	elif [ "$(pgrep -fc -u "${USER}" "tmux -L ${sessionname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" != "0" ]; then
@@ -187,7 +186,15 @@ fn_monitor_check_session() {
 		fn_script_log_error "Checking session: PIDS with the same tmux session and socket names are running"
 		fn_script_log_error "Checking session: Killing session with the socketname name ${sessionname} and session name ${sessionname}"
 		pkill -f "tmux -L ${sessionname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
-		command_restart.sh
+		core_exit.sh
+	# Check for tmux pids that are using the old type of tmux session. This will reduce issues with migration to release v23.5.0. #4296
+	elif [ "$(pgrep -fc -u "${USER}" "tmux new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" != "0" ]; then
+		fn_print_error "Checking session: PIDS with old type tmux session are running: "
+		fn_print_error_eol_nl
+		fn_script_log_error "Checking session: ERROR"
+		fn_script_log_error "Checking session: PIDS with old type tmux session are running"
+		fn_script_log_error "Checking session: Killing session with the session name ${sessionname}"
+		pkill -f "tmux new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
 		core_exit.sh
 	elif [ "${status}" != "0" ]; then
 		fn_print_ok "Checking session: "

From 8f714822fecdbff9907482612eec7238be73a26d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 7 Sep 2023 23:12:53 +0100
Subject: [PATCH 27/33] feat(ci): game server update checker (#4298)

* refactor: shorten module update function names

The commit renames the update functions for several game modules to shorter names. The new names are more concise and easier to remember, which should improve code readability and maintainability.

* feat: Add Update Check workflow

This commit adds a new GitHub Actions workflow that checks if LinuxGSM is picking up game server config and parameter variables. The workflow runs on push and manual triggers, with concurrency settings to cancel in-progress jobs. It downloads linuxgsm.sh, installs dependencies, grabs the server, enables developer mode, installs the server, and updates it.

* feat: Add concurrency group names to workflows

The `details-check.yml` and `update-check.yml` workflows now have a concurrency group name that includes the branch or tag name. This will allow for better management of concurrent workflow runs.

* refactor: Update script names for Minecraft, Factorio, Jedi Knight 2 and Vintage Story

This commit updates the script names for Minecraft, Factorio, Jedi Knight 2 and Vintage Story. The update includes changes to command_check_update.sh, command_update.sh, core_functions.sh and install_server_files.sh. The new script names are update_mc.sh (formerly update_minecraft.sh), update_fctr.sh (formerly update_factorio.sh), update_jk2.sh (formerly update_jediknight2.sh) and update_vints.sh (formerly update_vintagestory.sh).

* feat: Add support for 32-bit architecture

This commit adds support for 32-bit architecture by running the command "sudo dpkg --add-architecture i386" instead of installing libxml2-utils and jq.

* feat: Add i386 architecture and install libstdc++6

This commit adds the installation of libstdc++6:i386 package to support 32-bit applications. It also includes adding the i386 architecture to dpkg.

* feat: Update dependencies for LinuxGSM

Changed the dependency from libstdc++6:i386 to libgcc-s1:i386 in the update-check.yml file. This change was made to ensure compatibility with newer versions of LinuxGSM.

* feat: Add update and force-update server functionality

This commit adds the ability to check for updates and force updates on a server. The update-check.yml file has been modified to include new jobs that run the LGSM_GITHUBBRANCH command with specific arguments.

* feat: Add dependencies for server installation

This commit adds the necessary dependencies to install a game server. The `update-check.yml` file has been updated to include the installation of `bsdmainutils`, `libsdl2-2.0-0:i386`, `libtinfo5:i386`, and `steamcmd`.

* steamcmd only

* steamcmd

* test

* test

* refactor: improve random password generation in install_config.sh

The code change refactors the random password generation in the `install_config.sh` file. Instead of using `tr -dc A-Za-z0-9_ < /dev/urandom | head -c 8 | xargs`, it now uses `tr -dc 'A-Za-z0-9_' < /dev/urandom 2>/dev/null | head -c 8 | xargs`. This change improves the reliability and security of generating random passwords.

* refactor: remove redundant code and set default branch

The commit refactors the code by removing redundant code that sets the branch to "public" if no custom branch is specified. This change simplifies the logic and improves readability.

* test

* fix: fix steamcmd build version retrieval

The code changes in this commit fix an issue with retrieving the build version from SteamCMD. The previous implementation was not correctly capturing the buildid. This has been resolved by adding additional echo statements for debugging purposes.

* test

fix: remove unnecessary app_info_print command

The commit removes the unnecessary `app_info_print` command from the code. This command was not needed to check the buildid.

* fix: GitHub Actions test failure

The code change fixes a failing GitHub Actions test by running SteamCMD twice. The first run is to update the app info, and the second run retrieves the build ID for the specified branch.

* Add steam user and password secret for jk2

* refactor: update steamuser and steampass paths in jk2server config

The code changes refactor the paths for `steamuser` and `steampass` in the configuration file of the `jk2server`. The previous paths were incorrect, so they have been updated to point to the correct location.

* refactor: update steamuser and steampass insertion in LGSM configuration

The code changes refactor the way steamuser and steampass are inserted into the LGSM configuration file. Instead of hardcoding the values, they are now dynamically inserted using environment variables. This improves flexibility and security when setting up the server.

* refactor: simplify steamuser and steampass insertion in update-check.yml

The code changes remove unnecessary sed commands and replace them with a single echo command to insert the values of STEAMCMD_USER and STEAMCMD_PASS into the common.cfg file. This simplifies the code and improves readability.

* feat: update steamuser and steampass in common.cfg

The commit updates the code to properly insert the `steamuser` and `steampass` values in the `common.cfg` file. The previous code was not correctly formatting the values, which caused issues with server installation. This change ensures that the values are properly formatted using double quotes for `steamuser` and single quotes for `steampass`.
---
 .github/workflows/details-check.yml           |  2 +-
 .github/workflows/update-check.yml            | 48 +++++++++++++++++++
 lgsm/modules/command_check_update.sh          | 12 ++---
 lgsm/modules/command_update.sh                | 12 ++---
 lgsm/modules/core_functions.sh                | 12 ++---
 lgsm/modules/core_modules.sh                  | 12 ++---
 lgsm/modules/core_steamcmd.sh                 | 12 +++--
 lgsm/modules/install_config.sh                |  2 +-
 lgsm/modules/install_server_files.sh          | 14 +++---
 .../{update_factorio.sh => update_fctr.sh}    |  2 +-
 .../{update_jediknight2.sh => update_jk2.sh}  |  0
 .../{update_minecraft.sh => update_mc.sh}     |  2 +-
 ...ate_minecraft_bedrock.sh => update_mcb.sh} |  2 +-
 .../{update_papermc.sh => update_pmc.sh}      |  2 +-
 ...update_vintagestory.sh => update_vints.sh} |  2 +-
 15 files changed, 93 insertions(+), 43 deletions(-)
 create mode 100644 .github/workflows/update-check.yml
 rename lgsm/modules/{update_factorio.sh => update_fctr.sh} (99%)
 rename lgsm/modules/{update_jediknight2.sh => update_jk2.sh} (100%)
 rename lgsm/modules/{update_minecraft.sh => update_mc.sh} (99%)
 rename lgsm/modules/{update_minecraft_bedrock.sh => update_mcb.sh} (99%)
 rename lgsm/modules/{update_papermc.sh => update_pmc.sh} (99%)
 rename lgsm/modules/{update_vintagestory.sh => update_vints.sh} (99%)

diff --git a/.github/workflows/details-check.yml b/.github/workflows/details-check.yml
index 1ce9b373b..c2e60ddf6 100644
--- a/.github/workflows/details-check.yml
+++ b/.github/workflows/details-check.yml
@@ -5,7 +5,7 @@ on:
   push:
 
 concurrency:
-  group: ${{ github.ref_name }}
+  group: details-check-${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/update-check.yml b/.github/workflows/update-check.yml
new file mode 100644
index 000000000..dfbc7dd58
--- /dev/null
+++ b/.github/workflows/update-check.yml
@@ -0,0 +1,48 @@
+name: Update Check
+# This action will check that LinuxGSM is picking up game server config and parameter variables.
+on:
+  workflow_dispatch:
+  push:
+
+concurrency:
+  group: update-check-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  update-check:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        shortname: [css, fctr, jk2, mc, mcb, mta, pmc, ts3, ut99, vints]
+
+    steps:
+      - name: Download linuxgsm.sh
+        run: wget https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/linuxgsm.sh; chmod +x linuxgsm.sh
+
+      - name: Install dependencies
+        run: sudo dpkg --add-architecture i386; sudo apt-get update;
+
+      - name: Grab server
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./linuxgsm.sh ${{ matrix.shortname }}server
+
+      - name: Enable developer mode
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server developer
+
+      - name: Insert steamuser
+        if: matrix.shortname == 'jk2'
+        run: echo -e "steamuser=\"${{ secrets.STEAMCMD_USER }}\"\nsteampass='${{ secrets.STEAMCMD_PASS }}'" > lgsm/config-lgsm/${{ matrix.shortname }}server/common.cfg
+
+      - name: Install server
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server auto-install
+
+      - name: Check Update server
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server check-update
+
+      - name: Update server
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server update
+
+      - name: Force Update server
+        if: matrix.shortname == 'css'
+        run: LGSM_GITHUBBRANCH="${GITHUB_REF#refs/heads/}" ./${{ matrix.shortname }}server force-update
diff --git a/lgsm/modules/command_check_update.sh b/lgsm/modules/command_check_update.sh
index c7780c355..2e6855f7c 100644
--- a/lgsm/modules/command_check_update.sh
+++ b/lgsm/modules/command_check_update.sh
@@ -17,19 +17,19 @@ core_logs.sh
 if [ "${shortname}" == "ts3" ]; then
 	update_ts3.sh
 elif [ "${shortname}" == "mc" ]; then
-	update_minecraft.sh
+	update_mc.sh
 elif [ "${shortname}" == "mcb" ]; then
-	update_minecraft_bedrock.sh
+	update_mcb.sh
 elif [ "${shortname}" == "pmc" ] || [ "${shortname}" == "vpmc" ] || [ "${shortname}" == "wmc" ]; then
-	update_papermc.sh
+	update_pmc.sh
 elif [ "${shortname}" == "fctr" ]; then
-	update_factorio.sh
+	update_fctr.sh
 elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "jk2" ]; then
-	update_jediknight2.sh
+	update_jk2.sh
 elif [ "${shortname}" == "vints" ]; then
-	update_vintagestory.sh
+	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then
 	update_ut99.sh
 else
diff --git a/lgsm/modules/command_update.sh b/lgsm/modules/command_update.sh
index 62221d5e6..e1fcec97f 100644
--- a/lgsm/modules/command_update.sh
+++ b/lgsm/modules/command_update.sh
@@ -18,19 +18,19 @@ check_last_update.sh
 if [ "${shortname}" == "ts3" ]; then
 	update_ts3.sh
 elif [ "${shortname}" == "mc" ]; then
-	update_minecraft.sh
+	update_mc.sh
 elif [ "${shortname}" == "mcb" ]; then
-	update_minecraft_bedrock.sh
+	update_mcb.sh
 elif [ "${shortname}" == "pmc" ] || [ "${shortname}" == "vpmc" ] || [ "${shortname}" == "wmc" ]; then
-	update_papermc.sh
+	update_pmc.sh
 elif [ "${shortname}" == "fctr" ]; then
-	update_factorio.sh
+	update_fctr.sh
 elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "jk2" ]; then
-	update_jediknight2.sh
+	update_jk2.sh
 elif [ "${shortname}" == "vints" ]; then
-	update_vintagestory.sh
+	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then
 	update_ut99.sh
 else
diff --git a/lgsm/modules/core_functions.sh b/lgsm/modules/core_functions.sh
index 3b42e1f8f..356aa4d93 100644
--- a/lgsm/modules/core_functions.sh
+++ b/lgsm/modules/core_functions.sh
@@ -640,17 +640,17 @@ update_ts3.sh() {
 	fn_fetch_function
 }
 
-update_minecraft.sh() {
+update_mc.sh() {
 	functionfile="${FUNCNAME[0]}"
 	fn_fetch_function
 }
 
-update_minecraft_bedrock.sh() {
+update_mcb.sh() {
 	functionfile="${FUNCNAME[0]}"
 	fn_fetch_function
 }
 
-update_papermc.sh() {
+update_pmc.sh() {
 	functionfile="${FUNCNAME[0]}"
 	fn_fetch_function
 }
@@ -660,12 +660,12 @@ update_mta.sh() {
 	fn_fetch_function
 }
 
-update_factorio.sh() {
+update_fctr.sh() {
 	functionfile="${FUNCNAME[0]}"
 	fn_fetch_function
 }
 
-update_jediknight2.sh() {
+update_jk2.sh() {
 	functionfile="${FUNCNAME[0]}"
 	fn_fetch_function
 }
@@ -675,7 +675,7 @@ update_steamcmd.sh() {
 	fn_fetch_function
 }
 
-update_vintagestory.sh() {
+update_vints.sh() {
 	functionfile="${FUNCNAME[0]}"
 	fn_fetch_function
 }
diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh
index b191e793a..80b3463e3 100644
--- a/lgsm/modules/core_modules.sh
+++ b/lgsm/modules/core_modules.sh
@@ -645,17 +645,17 @@ update_ts3.sh() {
 	fn_fetch_module
 }
 
-update_minecraft.sh() {
+update_mc.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_minecraft_bedrock.sh() {
+update_mcb.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_papermc.sh() {
+update_pmc.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -665,12 +665,12 @@ update_mta.sh() {
 	fn_fetch_module
 }
 
-update_factorio.sh() {
+update_fctr.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
 
-update_jediknight2.sh() {
+update_jk2.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
@@ -680,7 +680,7 @@ update_steamcmd.sh() {
 	fn_fetch_module
 }
 
-update_vintagestory.sh() {
+update_vints.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
 }
diff --git a/lgsm/modules/core_steamcmd.sh b/lgsm/modules/core_steamcmd.sh
index 6d96a9e6c..83fc6f5c3 100644
--- a/lgsm/modules/core_steamcmd.sh
+++ b/lgsm/modules/core_steamcmd.sh
@@ -151,11 +151,6 @@ fn_update_steamcmd_localbuild() {
 	# Uses appmanifest to find local build.
 	localbuild=$(grep buildid "${appmanifestfile}" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
 
-	# Set branch to public if no custom branch.
-	if [ -z "${branch}" ]; then
-		branch="public"
-	fi
-
 	# Checks if localbuild variable has been set.
 	if [ -z "${localbuild}" ]; then
 		fn_print_fail "Checking local build: ${remotelocation}: missing local build info"
@@ -178,6 +173,13 @@ fn_update_steamcmd_remotebuild() {
 		find "${HOME}" -type f -name "appinfo.vdf" -exec rm -f {} \; 2> /dev/null
 	fi
 
+	# Set branch to public if no custom branch.
+	if [ -z "${branch}" ]; then
+		branch="public"
+	fi
+
+	# added as was failing GitHub Actions test. Running SteamCMD twice seems to fix it.
+	${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +quit 2> /dev/null
 	# password for branch not needed to check the buildid
 	remotebuildversion=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed -e '/"branches"/,/^}/!d' | sed -n "/\"${branch}\"/,/}/p" | grep -m 1 buildid | tr -cd '[:digit:]')
 
diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh
index 9dc0841d5..54f819aaf 100644
--- a/lgsm/modules/install_config.sh
+++ b/lgsm/modules/install_config.sh
@@ -64,7 +64,7 @@ fn_default_config_local() {
 # PASSWORD to random password
 fn_set_config_vars() {
 	if [ -f "${servercfgfullpath}" ]; then
-		random=$(tr -dc A-Za-z0-9_ < /dev/urandom | head -c 8 | xargs)
+		random=$(tr -dc 'A-Za-z0-9_' < /dev/urandom 2>/dev/null | head -c 8 | xargs)
 		servername="LinuxGSM"
 		rconpass="admin${random}"
 		echo -e "changing hostname."
diff --git a/lgsm/modules/install_server_files.sh b/lgsm/modules/install_server_files.sh
index 6db904992..70eb808b0 100644
--- a/lgsm/modules/install_server_files.sh
+++ b/lgsm/modules/install_server_files.sh
@@ -221,23 +221,23 @@ if [ "${shortname}" == "ts3" ]; then
 	update_ts3.sh
 elif [ "${shortname}" == "mc" ]; then
 	install_eula.sh
-	update_minecraft.sh
+	update_mc.sh
 elif [ "${shortname}" == "mcb" ]; then
-	update_minecraft_bedrock.sh
+	update_mcb.sh
 elif [ "${shortname}" == "pmc" ]; then
 	install_eula.sh
-	update_papermc.sh
+	update_pmc.sh
 elif [ "${shortname}" == "wmc" ] || [ "${shortname}" == "vpmc" ]; then
-	update_papermc.sh
+	update_pmc.sh
 elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "fctr" ]; then
-	update_factorio.sh
+	update_fctr.sh
 	install_factorio_save.sh
 elif [ "${shortname}" == "jk2" ]; then
-	update_jediknight2.sh
+	update_jk2.sh
 elif [ "${shortname}" == "vints" ]; then
-	update_vintagestory.sh
+	update_vints.sh
 elif [ "${shortname}" == "ut99" ]; then
 	fn_install_server_files
 	update_ut99.sh
diff --git a/lgsm/modules/update_factorio.sh b/lgsm/modules/update_fctr.sh
similarity index 99%
rename from lgsm/modules/update_factorio.sh
rename to lgsm/modules/update_fctr.sh
index f7fb06c7d..4cbcdbefc 100644
--- a/lgsm/modules/update_factorio.sh
+++ b/lgsm/modules/update_fctr.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM update_factorio.sh module
+# LinuxGSM update_fctr.sh module
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
diff --git a/lgsm/modules/update_jediknight2.sh b/lgsm/modules/update_jk2.sh
similarity index 100%
rename from lgsm/modules/update_jediknight2.sh
rename to lgsm/modules/update_jk2.sh
diff --git a/lgsm/modules/update_minecraft.sh b/lgsm/modules/update_mc.sh
similarity index 99%
rename from lgsm/modules/update_minecraft.sh
rename to lgsm/modules/update_mc.sh
index cfdf7e057..85e903577 100644
--- a/lgsm/modules/update_minecraft.sh
+++ b/lgsm/modules/update_mc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM update_minecraft.sh module
+# LinuxGSM update_mc.sh module
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
diff --git a/lgsm/modules/update_minecraft_bedrock.sh b/lgsm/modules/update_mcb.sh
similarity index 99%
rename from lgsm/modules/update_minecraft_bedrock.sh
rename to lgsm/modules/update_mcb.sh
index 92bffca31..b125a3c49 100644
--- a/lgsm/modules/update_minecraft_bedrock.sh
+++ b/lgsm/modules/update_mcb.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM update_minecraft_bedrock.sh module
+# LinuxGSM update_mcb.sh module
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
diff --git a/lgsm/modules/update_papermc.sh b/lgsm/modules/update_pmc.sh
similarity index 99%
rename from lgsm/modules/update_papermc.sh
rename to lgsm/modules/update_pmc.sh
index 2438c2d86..5154bfeb9 100644
--- a/lgsm/modules/update_papermc.sh
+++ b/lgsm/modules/update_pmc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM update_papermc.sh module
+# LinuxGSM update_pmc.sh module
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
diff --git a/lgsm/modules/update_vintagestory.sh b/lgsm/modules/update_vints.sh
similarity index 99%
rename from lgsm/modules/update_vintagestory.sh
rename to lgsm/modules/update_vints.sh
index 21e2d0e63..75755248c 100644
--- a/lgsm/modules/update_vintagestory.sh
+++ b/lgsm/modules/update_vints.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM update_vintagestory.sh module
+# LinuxGSM update_vints.sh module
 # Author: Daniel Gibbs
 # Contributors: http://linuxgsm.com/contrib
 # Website: https://linuxgsm.com

From 22e812f75c334447679cf45fa7dab278ba6b403a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 7 Sep 2023 23:39:43 +0100
Subject: [PATCH 28/33] fix(ts3): update now works in docker

---
 lgsm/modules/update_ts3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/modules/update_ts3.sh b/lgsm/modules/update_ts3.sh
index b031d2b34..40b299336 100644
--- a/lgsm/modules/update_ts3.sh
+++ b/lgsm/modules/update_ts3.sh
@@ -18,7 +18,7 @@ fn_update_localbuild() {
 	# Gets local build info.
 	fn_print_dots "Checking local build: ${remotelocation}"
 	# Uses log file to get local build.
-	localbuild=$(grep -Eo "TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}" "$(find ./* -name "ts3server*_0.log" 2> /dev/null | sort | tail -1)" | grep -Eo "((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}" | tail -1)
+	localbuild=$(grep -Eo "TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}" "$(find "${serverfiles}"/* -name "ts3server*_0.log" 2> /dev/null | sort | tail -1)" | grep -Eo "((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}" | tail -1)
 	if [ -z "${localbuild}" ]; then
 		fn_print_error "Checking local build: ${remotelocation}: missing local build info"
 		fn_script_log_error "Missing local build info"

From 6921851da6ef6beae05de5987d3fa1f32bd270e5 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 8 Sep 2023 08:49:25 +0100
Subject: [PATCH 29/33] feat(pvr): add fix_pvr.sh module

---
 lgsm/modules/command_monitor.sh | 3 +++
 lgsm/modules/core_modules.sh    | 5 +++++
 lgsm/modules/fix.sh             | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh
index b1d9b5f6d..5ce104a95 100644
--- a/lgsm/modules/command_monitor.sh
+++ b/lgsm/modules/command_monitor.sh
@@ -177,6 +177,7 @@ fn_monitor_check_session() {
 		fn_script_log_error "Checking session: There are PIDS with identical tmux sessions running"
 		fn_script_log_error "Checking session: Killing all tmux sessions with the socketname name ${socketname} and session name ${sessionname}"
 		pkill -f "tmux -L ${socketname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
+		command_restart.sh
 		core_exit.sh
 	# Check for tmux pids with the same tmux session and socket names. This will reduce issues with migration to release v23.5.0. #4296
 	elif [ "$(pgrep -fc -u "${USER}" "tmux -L ${sessionname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" != "0" ]; then
@@ -186,6 +187,7 @@ fn_monitor_check_session() {
 		fn_script_log_error "Checking session: PIDS with the same tmux session and socket names are running"
 		fn_script_log_error "Checking session: Killing session with the socketname name ${sessionname} and session name ${sessionname}"
 		pkill -f "tmux -L ${sessionname} new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
+		command_restart.sh
 		core_exit.sh
 	# Check for tmux pids that are using the old type of tmux session. This will reduce issues with migration to release v23.5.0. #4296
 	elif [ "$(pgrep -fc -u "${USER}" "tmux new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}")" != "0" ]; then
@@ -195,6 +197,7 @@ fn_monitor_check_session() {
 		fn_script_log_error "Checking session: PIDS with old type tmux session are running"
 		fn_script_log_error "Checking session: Killing session with the session name ${sessionname}"
 		pkill -f "tmux new-session -d -x ${sessionwidth} -y ${sessionheight} -s ${sessionname}"
+		command_restart.sh
 		core_exit.sh
 	elif [ "${status}" != "0" ]; then
 		fn_print_ok "Checking session: "
diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh
index 80b3463e3..4b004dbc1 100644
--- a/lgsm/modules/core_modules.sh
+++ b/lgsm/modules/core_modules.sh
@@ -421,6 +421,11 @@ fix_onset.sh() {
 	fn_fetch_module
 }
 
+fix_pvr.sh() {
+	modulefile="${FUNCNAME[0]}"
+	fn_fetch_module
+}
+
 fix_ro.sh() {
 	modulefile="${FUNCNAME[0]}"
 	fn_fetch_module
diff --git a/lgsm/modules/fix.sh b/lgsm/modules/fix.sh
index 322091f5a..a7f5f7378 100644
--- a/lgsm/modules/fix.sh
+++ b/lgsm/modules/fix.sh
@@ -52,7 +52,7 @@ fn_apply_fix() {
 	fi
 }
 
-apply_pre_start_fix=(arma3 armar ark av bt bo csgo cmw dst hw ins nmrih onset rust rw sdtd sfc sof2 squad st tf2 terraria ts3 mcb mta unt vh wurm zmr)
+apply_pre_start_fix=(arma3 armar ark av bt bo csgo cmw dst hw ins nmrih onset pvr rust rw sdtd sfc sof2 squad st tf2 terraria ts3 mcb mta unt vh wurm zmr)
 apply_post_install_fix=(av kf kf2 lo ro samp ut2k4 ut ut3)
 
 # validate registered fixes for safe development

From 9326d48684f3c679ed0ee2ecd03e3a7cfca3e0d1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 8 Sep 2023 23:45:59 +0100
Subject: [PATCH 30/33] fix(mta): change updater to use builds (#4310)

https://github.com/multitheftauto/mtasa-blue/issues/3176
---
 lgsm/modules/update_mc.sh    |  1 +
 lgsm/modules/update_mcb.sh   |  2 ++
 lgsm/modules/update_mta.sh   | 16 ++++++++++------
 lgsm/modules/update_pmc.sh   |  1 +
 lgsm/modules/update_vints.sh |  2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lgsm/modules/update_mc.sh b/lgsm/modules/update_mc.sh
index 85e903577..d65ee7563 100644
--- a/lgsm/modules/update_mc.sh
+++ b/lgsm/modules/update_mc.sh
@@ -11,6 +11,7 @@ fn_update_dl() {
 	# Download and extract files to serverfiles.
 	fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "${remotebuildfilename}" "chmodx" "norun" "noforce" "nohash"
 	cp -f "${tmpdir}/${remotebuildfilename}" "${serverfiles}/${executable#./}"
+	fn_clear_tmp
 }
 
 fn_update_localbuild() {
diff --git a/lgsm/modules/update_mcb.sh b/lgsm/modules/update_mcb.sh
index b125a3c49..ceb284b39 100644
--- a/lgsm/modules/update_mcb.sh
+++ b/lgsm/modules/update_mcb.sh
@@ -23,10 +23,12 @@ fn_update_dl() {
 			echo -e "${extractcmd}" >> "${lgsmlog}"
 		fi
 		echo -e "${extractcmd}"
+		fn_clear_tmp
 		core_exit.sh
 	else
 		fn_print_ok_eol_nl
 		fn_script_log_pass "Extracting ${local_filename}"
+		fn_clear_tmp
 	fi
 }
 
diff --git a/lgsm/modules/update_mta.sh b/lgsm/modules/update_mta.sh
index eab77c748..fd728b22d 100644
--- a/lgsm/modules/update_mta.sh
+++ b/lgsm/modules/update_mta.sh
@@ -11,13 +11,17 @@ fn_update_dl() {
 	# Download and extract files to tmpdir.
 	fn_fetch_file "http://linux.mtasa.com/dl/multitheftauto_linux_x64.tar.gz" "" "" "" "${tmpdir}" "multitheftauto_linux_x64.tar.gz" "nochmodx" "norun" "force" "nohash"
 	fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64.tar.gz" "${serverfiles}" "multitheftauto_linux_x64"
+	fn_clear_tmp
 }
 
 fn_update_localbuild() {
 	# Gets local build info.
 	fn_print_dots "Checking local build: ${remotelocation}"
-	# Uses log file to get local build.
-	localbuild=$(grep "= Multi Theft Auto: San Andreas v" "${serverfiles}/mods/deathmatch/logs/server.log" | awk '{ print $7 }' | sed -r 's/^.{1}//' | tail -1)
+	# Uses executable to get local build.
+	if [ -d "${executabledir}" ]; then
+		cd "${executabledir}" || exit
+		localbuild=$(${executable} -v 2> /dev/null)
+	fi
 	if [ -z "${localbuild}" ]; then
 		fn_print_error "Checking local build: ${remotelocation}: missing local build info"
 		fn_script_log_error "Missing local build info"
@@ -31,11 +35,11 @@ fn_update_localbuild() {
 
 fn_update_remotebuild() {
 	# Get remote build info.
-	apiurl="https://api.github.com/repos/multitheftauto/mtasa-blue/releases/latest"
+	apiurl="https://linux.multitheftauto.com/revision/latest.txt"
 	remotebuildresponse=$(curl -s "${apiurl}")
-	remotebuildfilename=$(echo "${remotebuildresponse}" | jq -r '.assets[]|select(.browser_download_url | contains("Linux-amd64")) | .name')
-	remotebuildurl=$(echo "${remotebuildresponse}" | jq -r '.assets[]|select(.browser_download_url | contains("Linux-amd64")) | .browser_download_url')
-	remotebuildversion=$(echo "${remotebuildresponse}" | jq -r '.tag_name')
+	remotebuildfilename="multitheftauto_linux_x64.tar.gz"
+	remotebuildurl="http://linux.mtasa.com/dl/multitheftauto_linux_x64.tar.gz"
+	remotebuildversion=$(echo "${remotebuildresponse}")
 	if [ "${firstcommandname}" != "INSTALL" ]; then
 		fn_print_dots "Checking remote build: ${remotelocation}"
 		# Checks if remotebuildversion variable has been set.
diff --git a/lgsm/modules/update_pmc.sh b/lgsm/modules/update_pmc.sh
index 5154bfeb9..56d36a09b 100644
--- a/lgsm/modules/update_pmc.sh
+++ b/lgsm/modules/update_pmc.sh
@@ -12,6 +12,7 @@ fn_update_dl() {
 	fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "${remotebuildfilename}" "chmodx" "norun" "force" "${remotebuildhash}"
 	cp -f "${tmpdir}/${remotebuildfilename}" "${serverfiles}/${executable#./}"
 	echo "${remotebuildversion}" > "${serverfiles}/build.txt"
+	fn_clear_tmp
 }
 
 fn_update_localbuild() {
diff --git a/lgsm/modules/update_vints.sh b/lgsm/modules/update_vints.sh
index 75755248c..d545a9c83 100644
--- a/lgsm/modules/update_vints.sh
+++ b/lgsm/modules/update_vints.sh
@@ -20,7 +20,7 @@ fn_update_localbuild() {
 	# Uses executable to get local build.
 	if [ -d "${executabledir}" ]; then
 		cd "${executabledir}" || exit
-		localbuild="$(${preexecutable} ${executable} --version | sed '/^[[:space:]]*$/d')"
+		localbuild="$(${preexecutable} ${executable} --version 2> /dev/null | sed '/^[[:space:]]*$/d')"
 	fi
 	if [ -z "${localbuild}" ]; then
 		fn_print_error "Checking local build: ${remotelocation}: missing local build info"

From 272b5008069736972a38c9b997d7eb6021465a20 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 8 Sep 2023 23:52:03 +0100
Subject: [PATCH 31/33] Update README.md

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f710ff66d..db89b8548 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
 	<a href="https://linuxgsm.com"><img src="https://i.imgur.com/Eoh1jsi.jpg" alt="LinuxGSM">
 	<a href="https://www.codacy.com/gh/GameServerManagers/LinuxGSM/dashboard"><img src="https://img.shields.io/codacy/grade/d19c5234dc3743d8a8a14093711ca52d?style=flat-square&logo=codacy&logoColor=white" alt="Codacy grade"></a>
-	<img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/GameServerManagers/LinuxGSM/git-sync.yml?color=0052CC&logo=bitbucket&style=flat-square">
+	<a href="https://bitbucket.org/GameServerManagers/linuxgsm"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/GameServerManagers/LinuxGSM/git-sync.yml?color=0052CC&logo=bitbucket&style=flat-square"></a>
 	<a href="https://linuxgsm.com/discord"><img alt="Discord" src="https://img.shields.io/discord/127498813903601664?color=5865F2&label=%20&logo=discord&logoColor=ffffff&style=flat-square"></a>
 	<a href="https://developer.valvesoftware.com/wiki/SteamCMD"><img src="https://img.shields.io/badge/SteamCMD-000000?style=flat-square&amp;logo=Steam&amp;logoColor=white" alt="SteamCMD"></a>
 	<a href="https://github.com/GameServerManagers/LinuxGSM/blob/main/LICENSE"><img src="https://img.shields.io/github/license/gameservermanagers/LinuxGSM?style=flat-square" alt="MIT License"></a>
@@ -11,7 +11,7 @@
 
 ## Hassle-Free Dedicated Game Servers
 
-Traditionally game servers are not easy to manage yourself. Admins often have to spend hours messing around trying to get their server working. LinuxGSM is a command-line tool designed to be as simple as possible, allowing admins to spend less time on management and more time gaming.
+Traditionally game servers are not easy to manage yourself. Admins often have to spend hours messing around trying to get their servers working. LinuxGSM is a command-line tool designed to be as simple as possible, allowing admins to spend less time on management and more time gaming.
 
 ## Main features
 
@@ -45,12 +45,12 @@ Documentation is found at [linuxgsm.com](https://linuxgsm.com) and [docs.linuxgs
 
 ## :question: Support
 
-There are various ways to get support, check out the [support](https://linuxgsm.com/support/) page to the right support.
+There are various ways to get support, check out the [support](https://linuxgsm.com/support/) page for the right support.
 
 ## :heart: Sponsor
 
-If you would like to [sponsor](https://linuxgsm.com/sponsor) to the project there are several ways you can, via [GitHub Sponsors](https://github.com/sponsors/dgibbs64) and [PayPal](https://www.paypal.me/dgibbs64). I would like to thank everyone who sponsors me. Since 2012 LinuxGSM has been steadily growing with new servers, features and improvements added regularly.
+If you would like to [sponsor](https://linuxgsm.com/sponsor) to the project there are several ways you can, via [GitHub Sponsors](https://github.com/sponsors/dgibbs64) and [PayPal](https://www.paypal.me/dgibbs64). I would like to thank everyone who sponsors me. Since 2012 LinuxGSM has been steadily growing with new servers, features, and improvements added regularly.
 
-## Contributors
+## 🧙‍♂️ Contributors
 
-A big thank you goes to all the wonderful people who contribute ideas, code, docs and support to this project.
+A big thank you goes to all the wonderful people who contribute ideas, code, docs, and support to this project.

From a4a85cfd0a481678cbbddde6f65d70f6df9d7454 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 10 Sep 2023 20:10:30 +0100
Subject: [PATCH 32/33] minor rewording

---
 lgsm/modules/command_install.sh | 1 -
 lgsm/modules/fix_vh.sh          | 2 +-
 lgsm/modules/info_distro.sh     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lgsm/modules/command_install.sh b/lgsm/modules/command_install.sh
index b3edd67c8..e8cba7560 100644
--- a/lgsm/modules/command_install.sh
+++ b/lgsm/modules/command_install.sh
@@ -48,6 +48,5 @@ else
 	fix.sh
 	install_stats.sh
 	install_complete.sh
-
 fi
 core_exit.sh
diff --git a/lgsm/modules/fix_vh.sh b/lgsm/modules/fix_vh.sh
index 831335c3c..c642a1a57 100644
--- a/lgsm/modules/fix_vh.sh
+++ b/lgsm/modules/fix_vh.sh
@@ -2,7 +2,7 @@
 # LinuxGSM fix_rust.sh module
 # Author: Alasdair Haig
 # Website: https://linuxgsm.com
-# Description: Resolves issues with Valheim,
+# Description: Resolves issues with Valheim.
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
diff --git a/lgsm/modules/info_distro.sh b/lgsm/modules/info_distro.sh
index aacee2b8f..a5607ef45 100644
--- a/lgsm/modules/info_distro.sh
+++ b/lgsm/modules/info_distro.sh
@@ -73,7 +73,7 @@ for distro_info in "${distro_info_array[@]}"; do
 	fi
 done
 
-# Get virtual environment
+# Get virtual environment type.
 if [ "$(command -v systemd-detect-virt 2> /dev/null)" ]; then
 	virtualenvironment="$(systemd-detect-virt)"
 fi

From 178c2163476005147f1a65ca60dcf8f7748d6a69 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 10 Sep 2023 20:11:29 +0100
Subject: [PATCH 33/33] Release v23.5.0

---
 lgsm/modules/core_functions.sh | 2 +-
 lgsm/modules/core_modules.sh   | 2 +-
 linuxgsm.sh                    | 2 +-
 tests/tests_fctrserver.sh      | 2 +-
 tests/tests_jc2server.sh       | 2 +-
 tests/tests_mcserver.sh        | 2 +-
 tests/tests_ts3server.sh       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lgsm/modules/core_functions.sh b/lgsm/modules/core_functions.sh
index 356aa4d93..e70775c34 100644
--- a/lgsm/modules/core_functions.sh
+++ b/lgsm/modules/core_functions.sh
@@ -8,7 +8,7 @@
 
 module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v23.4.0"
+modulesversion="v23.5.0"
 
 # Core
 
diff --git a/lgsm/modules/core_modules.sh b/lgsm/modules/core_modules.sh
index 4b004dbc1..29b2d39e3 100644
--- a/lgsm/modules/core_modules.sh
+++ b/lgsm/modules/core_modules.sh
@@ -8,7 +8,7 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v23.4.0"
+modulesversion="v23.5.0"
 
 # Core
 
diff --git a/linuxgsm.sh b/linuxgsm.sh
index d6b526e0e..5fce5d1c9 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.4.0"
+version="v23.5.0"
 shortname="core"
 gameservername="core"
 commandname="CORE"
diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
index 463920672..50bb6b4b2 100644
--- a/tests/tests_fctrserver.sh
+++ b/tests/tests_fctrserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.4.0"
+version="v23.5.0"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 72f3f1a22..f7b674f3d 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.4.0"
+version="v23.5.0"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"
diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh
index ab94c5dc9..4f28fbb58 100644
--- a/tests/tests_mcserver.sh
+++ b/tests/tests_mcserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.4.0"
+version="v23.5.0"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 4121bd462..5a41bf216 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.4.0"
+version="v23.5.0"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"