Merge branch 'release/v23.2.0' into develop

Author: dgibbs64

.vscode/extensions.json

@@ -1,11 +1,11 @@
 {
-    "recommendations": [
-        "ms-python.python",
-        "editorconfig.editorconfig",
-        "yzhang.markdown-all-in-one",
-        "esbenp.prettier-vscode",
-        "timonwong.shellcheck",
-        "foxundermoon.shell-format",
-        "redhat.vscode-yaml"
-    ]
+  "recommendations": [
+    "ms-python.python",
+    "editorconfig.editorconfig",
+    "yzhang.markdown-all-in-one",
+    "esbenp.prettier-vscode",
+    "timonwong.shellcheck",
+    "foxundermoon.shell-format",
+    "redhat.vscode-yaml"
+  ]
 }

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>
-	<a href="https://bitbucket.org/GameServerManagers/linuxgsm"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/GameServerManagers/LinuxGSM/Github%20to%20Bitbucket%20sync?color=%230052CC&label=Backup&logo=bitbucket&style=flat-square"></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://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>

lgsm/functions/check_ip.sh

@@ -12,15 +12,15 @@ info_game.sh
 
 ip_commands_array=("/bin/ip" "/usr/sbin/ip" "ip")
 for ip_command in "${ip_commands_array[@]}"; do
-	if [ "$(command -v ${ip_command} 2> /dev/null)" ]; then
+	if [ "$(command -v "${ip_command}" 2> /dev/null)" ]; then
 		ipcommand="${ip_command}"
 		break
 	fi
 done
 
 ethtool_commands_array=("/bin/ethtool" "/usr/sbin/ethtool" "ethtool")
 for ethtool_command in "${ethtool_commands_array[@]}"; do
-	if [ "$(command -v ${ethtool_command} 2> /dev/null)" ]; then
+	if [ "$(command -v "${ethtool_command}" 2> /dev/null)" ]; then
 		ethtoolcommand="${ethtool_command}"
 		break
 	fi
@@ -38,25 +38,25 @@ function fn_is_valid_ip() {
 
 # If the IP variable has been set by user.
 if fn_is_valid_ip "${ip}"; then
-	queryips=( "${ip}" )
-	webadminip=( "${ip}" )
-	telnetip=( "${ip}" )
+	queryips=("${ip}")
+	webadminip=("${ip}")
+	telnetip=("${ip}")
 # If game config does have an IP set.
-elif fn_is_valid_ip "${configip}";then
-	queryips=( "${configip}" )
+elif fn_is_valid_ip "${configip}"; then
+	queryips=("${configip}")
 	ip="${configip}"
 	webadminip=("${configip}")
 	telnetip=("${configip}")
 # If there is only 1 server IP address.
 # Some IP details can automaticly use the one IP
 elif [ "${#current_ips[@]}" == "1" ]; then
-	queryips=( "127.0.0.1" "${current_ips[@]}" )
+	queryips=("127.0.0.1" "${current_ips[@]}")
 	ip="0.0.0.0"
 	webadminip=("${current_ips[@]}")
 	telnetip=("${current_ips[@]}")
 # If no ip is set by the user and server has more than one IP.
 else
-	queryips=( "127.0.0.1" "${current_ips[@]}" )
+	queryips=("127.0.0.1" "${current_ips[@]}")
 	ip="0.0.0.0"
 	webadminip=("${ip}")
 	telnetip=("${ip}")

lgsm/functions/command_monitor.sh

@@ -72,7 +72,7 @@ fn_monitor_check_queryport() {
 		fn_print_dots "Checking port: "
 		fn_print_checking_eol
 		fn_script_log_info "Checking port: CHECKING"
-		if [ -n "${rconenabled}" ] && [ "${rconenabled}" != "true" ] && [ ${shortname} == "av" ]; then
+		if [ -n "${rconenabled}" ] && [ "${rconenabled}" != "true" ] && [ "${shortname}" == "av" ]; then
 			fn_print_warn "Checking port: Unable to query, rcon is not enabled"
 			fn_script_log_warn "Checking port: Unable to query, rcon is not enabled"
 		else

lgsm/functions/core_functions.sh

@@ -8,7 +8,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v23.1.0"
+modulesversion="v23.2.0"
 
 # Core
 

linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.1.0"
+version="v23.2.0"
 shortname="core"
 gameservername="core"
 commandname="CORE"

tests/tests_fctrserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.1.0"
+version="v23.2.0"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.1.0"
+version="v23.2.0"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

tests/tests_mcserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.1.0"
+version="v23.2.0"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

tests/tests_ts3server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v23.1.0"
+version="v23.2.0"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"