more servers completed

lgsm/config-default/config-lgsm/sbotsserver/_default.cfg

@@ -13,8 +13,6 @@ port="7777"
 queryport="27015"
 defaultmap="StationKappa"
 servername="LinuxGSM Server"
-serverpassword="NOT SET" # Can't be adjusted currently
-maxplayers="8"           # Can't be adjusted currently
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 startparameters="Port=${port}?QueryPort=${queryport} -startup_map ${defaultmap} -server_name \"${servername}\""

lgsm/modules/info_game.sh

@@ -1760,60 +1760,38 @@ fn_info_game_samp() {
 	fi
 }
 
+# Config Type: json
+# Parameters: false
+# Comment: // or /* */
 fn_info_game_sb() {
-	# Config
 	if [ ! -f "${servercfgfullpath}" ]; then
-		servername="${unavailable}"
+		fn_info_config_json "maxplayers" "maxPlayers"
-		queryenabled="${unavailable}"
+		fn_info_config_json "port" "gameServerPort"
-		rconenabled="${unavailable}"
+		fn_info_config_json "queryenabled" "runQueryServer"
-		rconpassword="${unavailable}"
+		fn_info_config_json "queryport" "queryServerPort"
-		port="21025"
+		fn_info_config_json "rconenabled" "runRconServer"
-		queryport="21025"
+		fn_info_config_json "rconpassword" "rconServerPassword"
-		rconport="21026"
+		fn_info_config_json "rconport" "rconServerPort"
-		maxplayers="8"
+		fn_info_config_json "servername" "serverName"
-	else
-		servername=$(grep "serverName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e 's/serverName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-		queryenabled=$(grep "runQueryServer" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e 's/runQueryServer//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-		rconenabled=$(grep "runRconServer" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e 's/runRconServer//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-		rconpassword=$(grep "rconServerPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e 's/rconServerPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-		port=$(grep "gameServerPort" "${servercfgfullpath}" | tr -cd '[:digit:]')
-		queryport=$(grep "queryServerPort" "${servercfgfullpath}" | tr -cd '[:digit:]')
-		rconport=$(grep "rconServerPort" "${servercfgfullpath}" | tr -cd '[:digit:]')
-		maxplayers=$(grep "maxPlayers" "${servercfgfullpath}" | tr -cd '[:digit:]')
-
-		# Not set
-		servername=${servername:-"NOT SET"}
-		queryenabled=${queryenabled:-"NOT SET"}
-		rconenabled=${rconenabled:-"NOT SET"}
-		rconpassword=${rconpassword:-"NOT SET"}
-		port=${port:-"21025"}
-		queryport=${queryport:-"21025"}
-		rconport=${rconport:-"21026"}
-		maxplayers=${maxplayers:-"8"}
 	fi
+	maxplayers="${maxplayers:-"0"}"
+	port="${port:-"0"}"
+	queryenabled="${queryenabled:-"NOT SET"}"
+	queryport="${queryport:-"0"}"
+	rconenabled="${rconenabled:-"NOT SET"}"
+	rconpassword="${rconpassword:-"NOT SET"}"
+	rconport="${rconport:-"0"}"
+	servername="${servername:-"NOT SET"}"
 }
 
+# Config Type: Parameters
 fn_info_game_sbots() {
-	# Config
+	port="${port:-"0"}"
-	if [ ! -f "${servercfgfullpath}" ]; then
+	queryport="${queryport:-"0"}"
-		servername="${unavailable}"
+	servername="${servername:-"NOT SET"}"
-		maxplayers="${unavailable}"
+	serverpassword="${serverpassword:-"NOT SET"}"
-	else
+	defaultmap="${defaultmap:-"NOT SET"}"
-		servername=$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=";,:' | sed -e 's/^[ \t]//' -e 's/[ \t]*$//')
+	maxplayers="${maxplayers:-"0"}"
-		maxplayers=$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')
-
-		# Not set
-		servername=${servername:-"NOT SET"}
-		maxplayers=${maxplayers:-"0"}
-	fi
-
-	# Parameters
-	port=${port:-"0"}
-	queryport=${queryport:-"0"}
-	servername=${servername:-"NOT SET"}
-	serverpassword=${serverpassword:-"NOT SET"}
-	defaultmap=${defaultmap:-"NOT SET"}
-	maxplayers=${maxplayers:-"0"}
 }
 
 # Config Type: custom (possibly YAML)
@@ -1821,24 +1799,20 @@ fn_info_game_sbots() {
 # Example: server_name: SERVERNAME
 # Filetype: txt
 fn_info_game_scpsl() {
-	# Config
+	if [ -f ${servercfgfullpath} ]; then
-	if [ ! -f "${servercfgfullpath}" ]; then
+		fn_info_game_pc_config "adminpassword" "administrator_query_password"
-		servername=${servername:-"NOT SET"}
+		fn_info_game_pc_config "configip" "ipv4_bind_ip"
-		maxplayers=${maxplayers:-"0"}
+		fn_info_game_pc_config "maxplayers" "max_players"
-		configip=${configip:-"0.0.0.0"}
+		fn_info_game_pc_config "servername" "server_name"
-		tickrate=${tickrate:-"NOT SET"}
+		fn_info_game_pc_config "tickrate" "server_tickrate"
-		adminpassword=${adminpassword:-"NOT SET"}
-	else
-		servername=$(sed -nr 's/^server_name: (.*)$/\1/p' "${servercfgfullpath}")
-		maxplayers=$(sed -nr 's/^max_players: (.*)$/\1/p' "${servercfgfullpath}")
-		configip=$(sed -nr 's/^ipv4_bind_ip: (.*)$/\1/p' "${servercfgfullpath}")
-		tickrate=$(sed -nr 's/^server_tickrate: (.*)$/\1/p' "${servercfgfullpath}")
-		adminpassword=$(sed -nr 's/^administrator_query_password: (.*)$/\1/p' "${servercfgfullpath}")
 	fi
-
+	adminpassword="${adminpassword:-"NOT SET"}"
-	# Parameters
+	configip="${configip:-"0.0.0.0"}"
-	port=${port:-"0"}
+	maxplayers="${maxplayers:-"0"}"
-	queryport=${port}
+	port="${port:-"0"}"
+	queryport="${port}"
+	servername="${servername:-"NOT SET"}"
+	tickrate="${tickrate:-"NOT SET"}"
 }
 
 # Config Type: xml

lgsm/modules/info_messages.sh

@@ -1531,26 +1531,6 @@ fn_info_message_tu() {
 	} | column -s $'\t' -t
 }
 
-fn_info_message_unreal() {
-	fn_info_message_password_strip
-	{
-		fn_port "header"
-		fn_port "Game" port udp
-		fn_port "Query" queryport udp
-		fn_port "LAN Beacon" beaconport udp
-		fn_port "Web Interface" httpport tcp
-	} | column -s $'\t' -t
-	echo -e ""
-	echo -e "${lightgreen}${servername} Web Interface${default}"
-	fn_messages_separator
-	{
-		echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
-		echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
-		echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
-		echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
-	} | column -s $'\t' -t
-}
-
 fn_info_message_ut2k4() {
 	{
 		fn_port "header"
@@ -1572,7 +1552,6 @@ fn_info_message_ut2k4() {
 }
 
 fn_info_message_unreal() {
-	fn_info_message_password_strip
 	{
 		fn_port "header"
 		fn_port "Game" port udp