Browse Source

Merge branch 'develop' into feature/ui-changes

feature/dst-changes
Daniel Gibbs 4 months ago
parent
commit
0776db35ff
  1. 5
      lgsm/config-default/config-lgsm/cs2server/_default.cfg
  2. 2
      lgsm/modules/core_modules.sh
  3. 2
      lgsm/modules/info_game.sh
  4. 2
      lgsm/modules/update_fctr.sh
  5. 2
      linuxgsm.sh

5
lgsm/config-default/config-lgsm/cs2server/_default.cfg

@ -15,6 +15,11 @@ port="27015"
maxplayers="16"
wsapikey=""
## Game Server Login Token (GSLT): Required
# GSLT is required for running a public server.
# More info: https://docs.linuxgsm.com/steamcmd/gslt
gslt=""
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
startparameters="-dedicated -ip ${ip} -port ${port} -maxplayers ${maxplayers} -authkey ${wsapikey} +exec ${selfname}.cfg"

2
lgsm/modules/core_modules.sh

@ -8,7 +8,7 @@
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v24.3.1"
modulesversion="v24.3.2"
# Core

2
lgsm/modules/info_game.sh

@ -1311,7 +1311,7 @@ fn_info_game_fctr() {
# get server version if installed.
local factoriobin="${executabledir}${executable:1}"
if [ -f "${factoriobin}" ]; then
serverversion="$(${factoriobin} --version | grep "Version:" | awk '{print $2}')"
serverversion="$(${factoriobin} --version | grep -m 1 "Version:" | awk '{print $2}')"
fi
}

2
lgsm/modules/update_fctr.sh

@ -20,7 +20,7 @@ fn_update_localbuild() {
# Uses executable to get local build.
if [ -d "${executabledir}" ]; then
cd "${executabledir}" || exit
localbuild=$(${executable} --version | grep "Version:" | awk '{print $2}')
localbuild=$(${executable} --version | grep -m 1 "Version:" | awk '{print $2}')
fi
if [ -z "${localbuild}" ]; then
fn_print_error "Checking local build: ${remotelocation}: missing local build info"

2
linuxgsm.sh

@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v24.3.1"
version="v24.3.2"
shortname="core"
gameservername="core"
commandname="CORE"

Loading…
Cancel
Save