Merge branch 'develop' into fix/pz-steamclient-so

lgsm/functions/core_functions.sh

@@ -325,6 +325,11 @@ functionfile="${FUNCNAME[0]}"
 fn_fetch_function
 }
 
+fix_cs.sh(){
+functionfile="${FUNCNAME[0]}"
+fn_fetch_function
+}
+
 fix_csgo.sh(){
 functionfile="${FUNCNAME[0]}"
 fn_fetch_function

lgsm/functions/fix.sh

@@ -40,6 +40,8 @@ if [ "${commandname}" != "INSTALL" ]&&[ -z "${fixbypass}" ]; then
 		fix_arma3.sh
 	elif [ "${shortname}" == "ark" ]; then
 		fix_ark.sh
+	elif [ "${shortname}" == "cs" ]; then
+		fix_cs.sh
 	elif [ "${shortname}" == "csgo" ]; then
 		fix_csgo.sh
 	elif [ "${shortname}" == "cmw" ]; then

lgsm/functions/fix_cs.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# LinuxGSM fix_cs.sh function
+# Author: Christian Birk
+# Website: https://linuxgsm.com
+# Description: Resolves various issues with Counter Strike.
+
+functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
+
+if [ "${shortname}" == "cs" ]; then
+	# Fixes: steamclient.so: cannot open shared object file: No such file or directory
+	if [ ! -f "${serverfiles}/steamclient.so" ]; then
+		fixname="steamclient.so x86"
+		fn_fix_msg_start
+		if [ -f "${HOME}/.steam/steamcmd/linux32/steamclient.so" ]; then
+			cp "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/steamclient.so" >> "${lgsmlog}"
+		elif [ -f "${steamcmddir}/linux32/steamclient.so" ]; then
+			cp "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/steamclient.so" >> "${lgsmlog}"
+		fi
+		fn_fix_msg_end
+	fi
+fi

lgsm/functions/fix_hw.sh

@@ -15,8 +15,6 @@ if [ "${shortname}" == "hw" ]; then
 			cp "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86/steamclient.so" >> "${lgsmlog}"
 		elif [ -f "${steamcmddir}/linux32/steamclient.so" ]; then
 			cp "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86/steamclient.so" >> "${lgsmlog}"
-		else
-			:
 		fi
 		fn_fix_msg_end
 	fi
@@ -27,8 +25,6 @@ if [ "${shortname}" == "hw" ]; then
 			cp "${steamcmddir}/linux64/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86_64/steamclient.so" >> "${lgsmlog}"
 		elif [ -f "${steamcmddir}/linux64/steamclient.so" ]; then
 			cp "${steamcmddir}/linux64/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86_64/steamclient.so" >> "${lgsmlog}"
-		else
-			:
 		fi
 		fn_fix_msg_end
 	fi

lgsm/functions/info_config.sh

@@ -377,15 +377,24 @@ fn_info_config_factorio(){
 		servername="Factorio Server"
 		serverpassword="${unavailable}"
 		maxplayers="${zero}"
+		authtoken=${authtoken:-"NOT SET"}
+		savegameinterval="${unavailable}"
+		versioncount="${unavailable}"
 	else
-		servername="Factorio Server"
+		servername=$(jq -r '.name' "${servercfgfullpath}")
-		serverpassword=$(grep "game_password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/game_password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		serverpassword=$(jq -r '.game_password' "${servercfgfullpath}")
-		maxplayers=$(grep "\"max_players\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
+		maxplayers=$(jq -r '.max_players' "${servercfgfullpath}")
+		authtoken=$(jq -r '.token' "${servercfgfullpath}")
+		savegameinterval=$(jq -r '.autosave_interval' "${servercfgfullpath}")
+		versioncount=$(jq -r '.autosave_slots' "${servercfgfullpath}")
 
 		# Not Set
 		servername=${servername:-"NOT SET"}
 		serverpassword=${serverpassword:-"NOT SET"}
-		maxplayers=${maxplayers=:-"0"}
+		maxplayers=${maxplayers:-"0"}
+		authtoken=${authtoken:-"NOT SET"}
+		savegameinterval=${savegameinterval:-"0"}
+		versioncount=${versioncount:-"0"}
 	fi
 }
 

lgsm/functions/info_messages.sh

@@ -382,6 +382,21 @@ fn_info_message_gameserver(){
 			echo -e "${lightblue}Server Version:\t${default}${serverversion}"
 		fi
 
+		# authentication token (Factorio)
+		if [ -n "${authtoken}" ]; then
+			echo -e "${lightblue}Auth Token:\t${default}${authtoken}"
+		fi
+
+		# savegameinterval (Factorio)
+		if [ -n "${savegameinterval}" ]; then
+			echo -e "${lightblue}Savegame Interval:\t${default}${savegameinterval}"
+		fi
+
+		# versioncount (Factorio)
+		if [ -n "${versioncount}" ]; then
+			echo -e "${lightblue}Version Count:\t${default}${versioncount}"
+		fi
+
 		# Listed on Master server
 		if [ -n "${displaymasterserver}" ]; then
 			if [ "${displaymasterserver}" == "true" ]; then