Merge branch 'hotfix/19.10.2'

Author: dgibbs64

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

@@ -13,14 +13,13 @@ ip="0.0.0.0"
 port="27015"
 clientport="27005"
 sourcetvport="27020"
-defaultmap="bastogne"
+defaultmap="bastogne stronghold"
 maxplayers="32"
 tickrate="64"
-workshop="0"
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} +sv_workshop_enabled ${workshop}"
+parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} -workshop"
 }
 
 #### LinuxGSM Settings ####

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

@@ -14,10 +14,6 @@ port="27015"
 maxplayers="20"
 defaultmap="pei"
 
-## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
-steamuser="username"
-steampass='password'
-
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 
 # Parameters are changed in game.ini and engine.ini (Location: ${systemdir}/Saved/Config/LinuxServer)

lgsm/functions/install_config.sh

@@ -186,7 +186,7 @@ elif [ "${shortname}" == "bt" ]; then
 	fn_fetch_default_config
 	fn_default_config_remote
 	fn_set_config_vars
-elif [ "${shortname}" == "Battalion 1944" ]; then
+elif [ "${shortname}" == "bt1944" ]; then
 	gamedirname="Battalion1944"
 	fn_check_cfgdir
 	array_configs+=( DefaultGame.ini )

lgsm/functions/install_server_files.sh

@@ -104,9 +104,6 @@ fn_install_server_files_steamcmd(){
 				if [ "${appid}" == "90" ]; then
 					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit
 					local exitcode=$?
-				elif [ "${shortname}" == "unt" ]; then
-					${unbuffer} ./steamcmd.sh +@sSteamCmdForcePlatformBitness 32 +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} validate +quit
-					local exitcode=$?
 				else
 					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} +quit
 					local exitcode=$?