Skip to content

v19.10.2 #2519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgibbs64 merged 4 commits into from
Sep 20, 2019
+3 −11
Merged

v19.10.2 #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89387aa
fix(utserver): remove SteamCMD auth requirement 32-bit workaround (#2…
h3o66 Sep 20, 2019
316a2ba
fix(doiserver): refactor workshop support (#2511)
Frisasky Sep 20, 2019
400fa25
fix typo
Frisasky Sep 13, 2019
9cbe6e8
fix(install): correct if statement for Battalion 1944 installer
dgibbs64 Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lgsm/config-default/config-lgsm/doiserver/_default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ####
Expand Down
4 changes: 0 additions & 4 deletions lgsm/config-default/config-lgsm/untserver/_default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lgsm/functions/install_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
3 changes: 0 additions & 3 deletions lgsm/functions/install_server_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=$?
Expand Down