Browse Source

Merge branch 'release/190503'

pull/2366/head v19.5.3
Daniel Gibbs 6 years ago
parent
commit
1258789040
  1. 223
      .all-contributorsrc
  2. 2
      PULL_REQUEST_TEMPLATE.md
  3. 5
      README.md
  4. 2
      lgsm/config-default/config-lgsm/bsserver/_default.cfg
  5. 18
      lgsm/config-default/config-lgsm/csgoserver/_default.cfg
  6. 2
      lgsm/config-default/config-lgsm/nmrihserver/_default.cfg
  7. 4
      lgsm/config-default/config-lgsm/twserver/_default.cfg
  8. 136
      lgsm/config-default/config-lgsm/untserver/_default.cfg
  9. 1
      lgsm/data/serverlist.csv
  10. 5
      lgsm/functions/check_deps.sh
  11. 8
      lgsm/functions/command_monitor.sh
  12. 2
      lgsm/functions/command_validate.sh
  13. 10
      lgsm/functions/core_functions.sh
  14. 4
      lgsm/functions/fix.sh
  15. 11
      lgsm/functions/fix_terraria.sh
  16. 11
      lgsm/functions/fix_unt.sh
  17. 3
      lgsm/functions/info_glibc.sh
  18. 14
      lgsm/functions/info_messages.sh
  19. 7
      lgsm/functions/info_parms.sh
  20. 6
      lgsm/functions/install_config.sh
  21. 3
      lgsm/functions/install_server_files.sh
  22. 6
      lgsm/functions/update_steamcmd.sh
  23. 2
      linuxgsm.sh
  24. 3
      tests/tests_mcserver.sh

223
.all-contributorsrc

@ -1,108 +1,119 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"contributors": [{
"login": "dgibbs64",
"name": "Daniel Gibbs",
"avatar_url": "https://avatars2.githubusercontent.com/u/4478206?v=4",
"profile": "https://danielgibbs.co.uk",
"contributions": [
"bug",
"code",
"ideas",
"question",
"review",
"content",
"doc",
"infra"
]
},
{
"login": "Frisasky",
"name": "Frisasky",
"avatar_url": "https://avatars2.githubusercontent.com/u/26865851?v=4",
"profile": "https://github.com/Frisasky",
"contributions": [
"question",
"bug",
"code"
]
},
{
"login": "kennyLtv",
"name": "Kenny Lindelof",
"avatar_url": "https://avatars2.githubusercontent.com/u/6133325?v=4",
"profile": "https://kennyl.design",
"contributions": [
"question"
]
},
{
"login": "Scarsz",
"name": "Austin Shapiro",
"avatar_url": "https://avatars1.githubusercontent.com/u/7691988?v=4",
"profile": "https://scarsz.me",
"contributions": [
"bug",
"code"
]
},
{
"login": "marvinlehmann",
"name": "Marvin Lehmann",
"avatar_url": "https://avatars2.githubusercontent.com/u/4151266?v=4",
"profile": "https://github.com/marvinlehmann",
"contributions": [
"bug",
"code"
]
},
{
"login": "Bourne-ID",
"name": "Bourne-ID",
"avatar_url": "https://avatars1.githubusercontent.com/u/7073616?v=4",
"profile": "https://github.com/Bourne-ID",
"contributions": [
"review",
"content",
"doc",
"infra",
"review"
]
},
{
"login": "cedarlug",
"name": "CedarLUG",
"avatar_url": "https://avatars2.githubusercontent.com/u/19336442?v=4",
"profile": "http://cedarlug.org",
"contributions": [
"bug",
"code",
"ideas",
"question",
"review"
]
},
{
"login": "UltimateByte",
"name": "UltimateByte",
"avatar_url": "https://avatars3.githubusercontent.com/u/8805941?v=4",
"profile": "https://www.terageek.org | https://www.haisoft.fr",
"contributions": [
"bug",
"code",
"doc",
"ideas",
"review"
]
}
],
"contributorsPerLine": 7,
"projectName": "LinuxGSM",
"projectOwner": "GameServerManagers",
"repoType": "github",
"repoHost": "https://github.com"
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "dgibbs64",
"name": "Daniel Gibbs",
"avatar_url": "https://avatars2.githubusercontent.com/u/4478206?v=4",
"profile": "https://danielgibbs.co.uk",
"contributions": [
"bug",
"code",
"ideas",
"question",
"review",
"content",
"doc",
"infra"
]
},
{
"login": "Frisasky",
"name": "Frisasky",
"avatar_url": "https://avatars2.githubusercontent.com/u/26865851?v=4",
"profile": "https://github.com/Frisasky",
"contributions": [
"question",
"bug",
"code"
]
},
{
"login": "kennyLtv",
"name": "Kenny Lindelof",
"avatar_url": "https://avatars2.githubusercontent.com/u/6133325?v=4",
"profile": "https://kennyl.design",
"contributions": [
"question"
]
},
{
"login": "Scarsz",
"name": "Austin Shapiro",
"avatar_url": "https://avatars1.githubusercontent.com/u/7691988?v=4",
"profile": "https://scarsz.me",
"contributions": [
"bug",
"code"
]
},
{
"login": "marvinlehmann",
"name": "Marvin Lehmann",
"avatar_url": "https://avatars2.githubusercontent.com/u/4151266?v=4",
"profile": "https://github.com/marvinlehmann",
"contributions": [
"bug",
"code"
]
},
{
"login": "Bourne-ID",
"name": "Bourne-ID",
"avatar_url": "https://avatars1.githubusercontent.com/u/7073616?v=4",
"profile": "https://github.com/Bourne-ID",
"contributions": [
"review",
"content",
"doc",
"infra",
"review"
]
},
{
"login": "cedarlug",
"name": "CedarLUG",
"avatar_url": "https://avatars2.githubusercontent.com/u/19336442?v=4",
"profile": "http://cedarlug.org",
"contributions": [
"bug",
"code",
"ideas",
"question",
"review"
]
},
{
"login": "UltimateByte",
"name": "UltimateByte",
"avatar_url": "https://avatars3.githubusercontent.com/u/8805941?v=4",
"profile": "https://www.terageek.org | https://www.haisoft.fr",
"contributions": [
"bug",
"code",
"doc",
"ideas",
"review"
]
},
{
"login": "borzaka",
"name": "Attila",
"avatar_url": "https://avatars0.githubusercontent.com/u/1230402?v=4",
"profile": "https://github.com/borzaka",
"contributions": [
"code",
"bug"
]
}
],
"contributorsPerLine": 7,
"projectName": "LinuxGSM",
"projectOwner": "GameServerManagers",
"repoType": "github",
"repoHost": "https://github.com"
}

2
PULL_REQUEST_TEMPLATE.md

@ -10,7 +10,7 @@ Fixes #[issue]
* [ ] New feature (change which adds functionality).
* [ ] New Server (new server added).
* [ ] Refactor (restructures existing code).
* [ ] Comment update (typo, spelling, etc).
* [ ] Comment update (typo, spelling, explanation, examples, etc).
* [ ] This change requires a documentation update.
## Checklist

5
README.md

File diff suppressed because one or more lines are too long

2
lgsm/config-default/config-lgsm/bsserver/_default.cfg

@ -114,7 +114,7 @@ engine="source"
## Server Specific Directories
systemdir="${serverfiles}/berimbau"
executabledir="${serverfiles}"
executabledir="${serverfiles}/bin"
executable="./srcds_run.sh"
servercfg="${servicename}.cfg"
servercfgdefault="server.cfg"

18
lgsm/config-default/config-lgsm/csgoserver/_default.cfg

@ -10,15 +10,15 @@
## Server Start Settings | https://docs.linuxgsm.com/configuration/start-parameters
# https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
# [Game Modes] gametype gamemode mapgroup (you can mix these across Game Modes, but use only one)
# Arms Race 1 0 mg_armsrace
# Classic Casual 0 0 mg_casualsigma, mg_casualdelta
# Classic Competitive 0 1 mg_active, mg_reserves, mg_hostage, mg_de_dust2
# Custom 3 0
# Deathmatch 1 2 mg_deathmatch
# Demolition 1 1 mg_demolition
# Wingman 0 2
# Danger Zone (FreeForAll) 6 0 mg_dz_blacksite
# [Game Modes] gametype gamemode mapgroup (you can mix these across all Game Modes except Danger Zone, but use only one)
# Arms Race 1 0 mg_armsrace
# Classic Casual 0 0 mg_casualsigma, mg_casualdelta
# Classic Competitive 0 1 mg_active, mg_reserves, mg_hostage, mg_de_dust2
# Custom 3 0
# Deathmatch 1 2 mg_deathmatch
# Demolition 1 1 mg_demolition
# Wingman 0 2
# Danger Zone 6 0 mg_dz_blacksite (map: dz_blacksite), mg_dz_sirocco (map: dz_sirocco)
gametype="0"
gamemode="0"
mapgroup="mg_active"

2
lgsm/config-default/config-lgsm/nmrihserver/_default.cfg

@ -23,7 +23,7 @@ gslt=""
## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
fn_parms(){
parms="-game nmrih -insecure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
parms="-game nmrih -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
}
#### LinuxGSM Settings ####

4
lgsm/config-default/config-lgsm/twserver/_default.cfg

@ -17,7 +17,7 @@ ip="0.0.0.0"
## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
fn_parms(){
parms="-f ${servercfgfullpath}"
parms="-f ${servercfg}"
}
#### LinuxGSM Settings ####
@ -108,7 +108,7 @@ executabledir="${systemdir}"
executable="./teeworlds_srv"
servercfg="${servicename}.cfg" # Teeworlds can also auto load any config if an autoexec.cfg file is present in the server dir
servercfgdefault="server.cfg"
servercfgdir="${serverfiles}"
servercfgdir="${serverfiles}/tw"
servercfgfullpath="${servercfgdir}/${servercfg}"
## Backup Directory

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

@ -0,0 +1,136 @@
##################################
######## Default Settings ########
##################################
# DO NOT EDIT WILL BE OVERWRITTEN!
# Copy settings from here and use them in either
# common.cfg - applies settings to every instance
# [instance].cfg - applies settings to a specific instance
#### Server Settings ####
## Server Start Settings | https://docs.linuxgsm.com/configuration/start-parameters
ip="0.0.0.0"
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)
# Make sure you change the admin password before launching the server
fn_parms(){
parms="-port:${port} -players:${maxplayers} --nographics -${defaultmap} -batchmode +secureserver/${servicename}"
}
#### LinuxGSM Settings ####
## Notification Alerts
# (on|off)
# More info | https://docs.linuxgsm.com/alerts#more-info
postalert="off"
postdays="7"
posttarget="https://hastebin.com"
# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
discordalert="off"
discordwebhook="webhook"
# Email Alerts | https://docs.linuxgsm.com/alerts/email
emailalert="off"
email="[email protected]"
emailfrom=""
# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
iftttalert="off"
ifttttoken="accesstoken"
iftttevent="linuxgsm_alert"
# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
mailgunalert="off"
mailguntoken="accesstoken"
mailgundomain="example.com"
mailgunemailfrom="[email protected]"
mailgunemail="[email protected]"
# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
pushbulletalert="off"
pushbullettoken="accesstoken"
channeltag=""
# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
pushoveralert="off"
pushovertoken="accesstoken"
# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram
# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring".
# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need
# any custom string in curl - simple ignore this parameter.
telegramalert="off"
telegramtoken="accesstoken"
telegramchatid=""
curlcustomstring=""
## Updating | https://docs.linuxgsm.com/commands/update
updateonstart="off"
## Backup | https://docs.linuxgsm.com/commands/backup
maxbackups="4"
maxbackupdays="30"
stoponbackup="on"
## Logging | https://docs.linuxgsm.com/features/logging
consolelogging="on"
logdays="7"
#### LinuxGSM Advanced Settings ####
# ANSI Colors
ansi="on"
## SteamCMD Settings
# Server appid
appid="304930"
# Steam App Branch Select
# Allows to opt into the various Steam app branches. Default branch is "".
# Example: "-beta latest_experimental"
branch=""
## LinuxGSM Server Details
# Do not edit
gamename="Unturned"
engine="unity3d"
#### Directories ####
# Edit with care
## Server Specific Directories
systemdir="${serverfiles}"
executabledir="${serverfiles}"
executable="./Unturned_Headless.x86"
servercfgdir="${systemdir}/Servers/${servicename}"
servercfg="Config.json"
servercfgdefault="Config.json"
servercfgfullpath="${servercfgdir}/${servercfg}"
## Backup Directory
backupdir="${lgsmdir}/backup"
## Logging Directories
logdir="${rootdir}/log"
gamelogdir="${logdir}/server"
lgsmlogdir="${logdir}/script"
consolelogdir="${logdir}/console"
lgsmlog="${lgsmlogdir}/${servicename}-script.log"
consolelog="${consolelogdir}/${servicename}-console.log"
alertlog="${lgsmlogdir}/${servicename}-alert.log"
postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
## Logs Naming
lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

1
lgsm/data/serverlist.csv

@ -83,6 +83,7 @@ tu,tuserver,Tower Unite
ut2k4,ut2k4server,Unreal Tournament 2004
ut3,ut3server,Unreal Tournament 3
ut99,ut99server,Unreal Tournament 99
unt,untserver,Unturned
vs,vsserver,Vampire Slayer
wet,wetserver,Wolfenstein: Enemy Territory
wurm,wurmserver,Wurm Unlimited

1 arma3 arma3server ARMA 3

5
lgsm/functions/check_deps.sh

@ -56,7 +56,10 @@ fn_install_mono_repo(){
monoautoinstall="1"
fi
elif [ "${distroid}" == "centos" ]; then
if [ "${distroversion}" == "7" ]; then
if [ "${distroversion}" == "8" ]; then
cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'"
eval ${cmd}
elif [ "${distroversion}" == "7" ]; then
cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'"
eval ${cmd}
elif [ "${distroversion}" == "6" ]; then

8
lgsm/functions/command_monitor.sh

@ -30,6 +30,9 @@ for queryattempt in {1..5}; do
elif [ "${querymethod}" == "tcp" ]; then
bash -c 'exec 3<> /dev/tcp/'${ip}'/'${queryport}''
querystatus="$?"
elif [ "${querymethod}" == "udp" ]; then
bash -c 'exec 3<> /dev/udp/'${ip}'/'${queryport}''
querystatus="$?"
fi
if [ "${querystatus}" == "0" ]; then
@ -175,6 +178,11 @@ fn_monitor_query_tcp(){
fn_monitor_loop
}
fn_monitor_query_upd(){
querymethod="upd"
fn_monitor_loop
}
monitorflag=1
fn_print_dots "${servername}"
sleep 0.5

2
lgsm/functions/command_validate.sh

@ -27,6 +27,8 @@ fn_validation(){
if [ "${appid}" == "90" ]; then
${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +app_update "${appid}" ${branch} validate +quit | tee -a "${lgsmlog}"
elif [ "${gamename}" == "Unturned" ]; then
${unbuffer} ./steamcmd.sh +@sSteamCmdForcePlatformBitness 32 +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} validate +quit
else
${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} validate +quit | tee -a "${lgsmlog}"
fi

10
lgsm/functions/core_functions.sh

@ -357,6 +357,11 @@ functionfile="${FUNCNAME}"
fn_fetch_function
}
fix_terraria.sh(){
functionfile="${FUNCNAME}"
fn_fetch_function
}
fix_tf2.sh(){
functionfile="${FUNCNAME}"
fn_fetch_function
@ -397,6 +402,11 @@ functionfile="${FUNCNAME}"
fn_fetch_function
}
fix_unt.sh(){
functionfile="${FUNCNAME}"
fn_fetch_function
}
fix_wurm.sh(){
functionfile="${FUNCNAME}"
fn_fetch_function

4
lgsm/functions/fix.sh

@ -63,10 +63,14 @@ if [ "${function_selfname}" != "command_install.sh" ]&&[ -z "${fixbypass}" ]; th
fix_ss3.sh
elif [ "${shortname}" == "tf2" ]; then
fix_tf2.sh
elif [ "${shortname}" == "terraria" ]; then
fix_terraria.sh
elif [ "${shortname}" == "ts3" ]; then
fix_ts3.sh
elif [ "${shortname}" == "mta" ]; then
fix_mta.sh
elif [ "${shortname}" == "unt" ]; then
fix_unt.sh
elif [ "${shortname}" == "wurm" ]; then
fix_wurm.sh
fi

11
lgsm/functions/fix_terraria.sh

@ -0,0 +1,11 @@
#!/bin/bash
# LinuxGSM fix_terraria.sh function
# Author: Daniel Gibbs
# Website: https://linuxgsm.com
# Description: Resolves an issue with Terraria.
local commandname="FIX"
local commandaction="Fix"
local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
export TERM=xterm

11
lgsm/functions/fix_unt.sh

@ -0,0 +1,11 @@
#!/bin/bash
# LinuxGSM fix_rust.sh function
# Author: Daniel Gibbs
# Website: https://linuxgsm.com
# Description: Resolves startup issue with Unturned
local commandname="FIX"
local commandaction="Fix"
# Fixes: [Raknet] Server Shutting Down (Shutting Down)
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${systemdir}/lib"

3
lgsm/functions/info_glibc.sh

@ -165,6 +165,9 @@ elif [ "${gamename}" == "Wurm Unlimited" ]; then
elif [ "${gamename}" == "Multi Theft Auto" ]; then
glibcrequired="2.7"
glibcfix="no"
elif [ "${gamename}" == "Unturned" ]; then
glibcrequired="2.15"
glibcfix="no"
elif [ "${gamename}" == "Zombie Panic! Source" ]; then
glibcrequired="2.15"
glibcfix="yes"

14
lgsm/functions/info_messages.sh

@ -495,7 +495,7 @@ fn_info_message_ports(){
fi
done
# engines/games that require editing the parms
local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "ioquake3" "Rust" "spark" "source" "starbound" "unreal4" "realvirtuality")
local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "ioquake3" "Rust" "spark" "source" "starbound" "unreal4" "realvirtuality" "Unturned")
for port_edit in "${ports_edit_array[@]}"
do
if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]||[ "${shortname}" == "${port_edit}" ]; then
@ -1107,6 +1107,16 @@ fn_info_message_unreal3(){
} | column -s $'\t' -t
}
fn_info_message_unturned(){
echo -e "netstat -atunp | grep Unturned"
echo -e ""
{
echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
echo -e "> Game\tINBOUND\t${port}\tudp"
echo -e "> Query\tINBOUND\t${queryport}\tudp"
} | column -s $'\t' -t
}
fn_info_message_kf2(){
echo -e "netstat -atunp | grep KFGame"
echo -e ""
@ -1229,6 +1239,8 @@ fn_info_message_select_engine(){
fn_info_message_teamspeak3
elif [ "${gamename}" == "Tower Unite" ]; then
fn_info_message_towerunite
elif [ "${shortname}" == "unt" ]; then
fn_info_message_unturned
elif [ "${gamename}" == "Multi Theft Auto" ]; then
fn_info_message_mta
elif [ "${gamename}" == "Mumble" ]; then

7
lgsm/functions/info_parms.sh

@ -164,6 +164,11 @@ fn_info_parms_unreal3(){
adminpassword=${adminpassword:-"NOT SET"}
}
fn_info_parms_unturned(){
servername=${servicename:-"NOT SET"}
port=${port:-"0"}
queryport=$((port + 1))
}
fn_info_parms_kf2(){
queryport=${queryport:-"0"}
defaultmap=${defaultmap:-"NOT SET"}
@ -222,4 +227,6 @@ elif [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then
# Unreal 3 engine
elif [ "${engine}" == "unreal3" ]; then
fn_info_parms_unreal3
elif [ "${shortname}" == "unt" ]; then
fn_info_parms_unturned
fi

6
lgsm/functions/install_config.sh

@ -607,6 +607,12 @@ elif [ "${gamename}" == "Unreal Tournament 99" ]; then
fn_fetch_default_config
fn_default_config_remote
fn_set_config_vars
elif [ "${shortname}" == "unt" ]; then
gamedirname="Unturned"
array_configs+=( Config.json )
fn_fetch_default_config
fn_default_config_remote
fn_set_config_vars
elif [ "${gamename}" == "Vampire Slayer" ]; then
gamedirname="VampireSlayer"
array_configs+=( server.cfg )

3
lgsm/functions/install_server_files.sh

@ -92,6 +92,9 @@ 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=$?

6
lgsm/functions/update_steamcmd.sh

@ -20,6 +20,8 @@ fn_update_steamcmd_dl(){
cd "${steamcmddir}" || exit
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 | tee -a "${lgsmlog}"
elif [ "${shortname}" == "unt" ]; then
${unbuffer} ./steamcmd.sh +@sSteamCmdForcePlatformBitness 32 +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} validate +quit
else
${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} +quit | tee -a "${lgsmlog}"
fi
@ -73,7 +75,7 @@ fn_update_steamcmd_remotebuild(){
fn_script_log_fatal "Unable to get remote build"
core_exit.sh
fi
fi
fi
}
fn_update_steamcmd_compare(){
@ -134,7 +136,7 @@ fn_update_steamcmd_compare(){
if [ -v "${branch}" ]; then
echo -e "* Branch: ${branch}"
fi
echo -e "https://steamdb.info/app/${appid}/"
echo -e "https://steamdb.info/app/${appid}/"
fn_script_log_info "No update available"
fn_script_log_info "Local build: ${localbuild}"
fn_script_log_info "Remote build: ${remotebuild}"

2
linuxgsm.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="190422"
version="190503"
shortname="core"
gameservername="core"
rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"

3
tests/tests_mcserver.sh

@ -2,10 +2,11 @@
# Project: Game Server Managers - LinuxGSM
# Author: Daniel Gibbs
# License: MIT License, Copyright (c) 2019 Daniel Gibbs
# Purpose: Travis CI Tests: Factorio | Linux Game Server Management Script
# Purpose: Travis CI Tests: Minecraft | Linux Game Server Management Script
# Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
# Documentation: https://docs.linuxgsm.com/
# Website: https://linuxgsm.com
travistest="1"
version="190401"
shortname="mc"

Loading…
Cancel
Save