Browse Source

Merge branch 'hotfix/v23.3.5'

pull/4258/head v23.3.5
Daniel Gibbs 2 years ago
parent
commit
18bf74af98
  1. 4
      lgsm/config-default/config-lgsm/btserver/_default.cfg
  2. 4
      lgsm/config-default/config-lgsm/solserver/_default.cfg
  3. 16
      lgsm/config-default/config-lgsm/stserver/_default.cfg
  4. 4
      lgsm/config-default/config-lgsm/ut3server/_default.cfg
  5. 4
      lgsm/data/almalinux-8.csv
  6. 4
      lgsm/data/almalinux-9.csv
  7. 4
      lgsm/data/centos-7.csv
  8. 4
      lgsm/data/centos-8.csv
  9. 4
      lgsm/data/centos-9.csv
  10. 4
      lgsm/data/debian-10.csv
  11. 4
      lgsm/data/debian-11.csv
  12. 4
      lgsm/data/debian-12.csv
  13. 4
      lgsm/data/debian-9.csv
  14. 4
      lgsm/data/rhel-7.csv
  15. 4
      lgsm/data/rhel-8.csv
  16. 4
      lgsm/data/rhel-9.csv
  17. 4
      lgsm/data/rocky-8.csv
  18. 4
      lgsm/data/rocky-9.csv
  19. 2
      lgsm/data/serverlist.csv
  20. 4
      lgsm/data/ubuntu-16.04.csv
  21. 4
      lgsm/data/ubuntu-18.04.csv
  22. 4
      lgsm/data/ubuntu-20.04.csv
  23. 4
      lgsm/data/ubuntu-21.04.csv
  24. 4
      lgsm/data/ubuntu-21.10.csv
  25. 4
      lgsm/data/ubuntu-22.04.csv
  26. 4
      lgsm/data/ubuntu-23.04.csv
  27. 4
      lgsm/modules/check.sh
  28. 2
      lgsm/modules/check_deps.sh
  29. 4
      lgsm/modules/check_permissions.sh
  30. 2
      lgsm/modules/check_root.sh
  31. 2
      lgsm/modules/command_install.sh
  32. 2
      lgsm/modules/core_exit.sh
  33. 2
      lgsm/modules/core_functions.sh
  34. 2
      lgsm/modules/core_getopt.sh
  35. 2
      lgsm/modules/core_modules.sh
  36. 32
      lgsm/modules/info_game.sh
  37. 13
      lgsm/modules/info_messages.sh
  38. 9
      lgsm/modules/install_config.sh
  39. 10
      linuxgsm.sh
  40. 2
      tests/tests_fctrserver.sh
  41. 2
      tests/tests_jc2server.sh
  42. 2
      tests/tests_mcserver.sh
  43. 2
      tests/tests_ts3server.sh

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

@ -137,8 +137,8 @@ stopmode="7"
# 3: gamedig
# 4: gsquery
# 5: tcp
querymode="2"
querytype="protocol-valve"
querymode="1"
querytype=""
## Console type
consoleverbose="yes"

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

@ -141,8 +141,8 @@ stopmode="2"
# 3: gamedig
# 4: gsquery
# 5: tcp
querymode="4"
querytype="soldat"
querymode="5"
querytype=""
## Console type
consoleverbose="yes"

16
lgsm/config-default/config-lgsm/stserver/_default.cfg

@ -9,18 +9,12 @@
#### Game Server Settings ####
## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
ip="0.0.0.0"
maxplayers="10"
port="27500"
queryport="27015"
saveinterval="300"
servername="LinuxGSM"
worldname="moon_save"
worldtype="Moon"
## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
# Edit with care
startparameters="-LOADLATEST ${worldname} ${worldtype} -settings ServerName ${servername} StartLocalHost true ServerVisible true ServerMaxPlayers ${maxplayers} GamePort ${port} UpdatePort ${queryport} UPNPEnabled true AutoSave true SaveInterval ${saveinterval}"
startparameters="-LOADLATEST ${worldname} ${worldtype}"
#### LinuxGSM Settings ####
@ -148,18 +142,18 @@ stopmode="3"
# 3: gamedig
# 4: gsquery
# 5: tcp
querymode="2"
querytype="protocol-valve"
querymode="1"
querytype=""
## Console type
consoleverbose="yes"
consoleinteract="vo"
consoleinteract="yes"
## Game Server Details
# Do not edit
gamename="Stationeers"
engine="unity3d"
glibc="2.15"
glibc="2.34"
#### Directories ####
# Edit with care

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

@ -144,8 +144,8 @@ stopmode="2"
# 3: gamedig
# 4: gsquery
# 5: tcp
querymode="2"
querytype="ut3"
querymode="1"
querytype=""
## Console type
consoleverbose="yes"

4
lgsm/data/almalinux-8.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/almalinux-9.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/centos-7.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/centos-8.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/centos-9.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/debian-10.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/debian-11.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/debian-12.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl3:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/debian-9.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/rhel-7.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/rhel-8.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/rhel-9.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/rocky-8.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/rocky-9.csv

@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
bmdm,ncurses-libs.i686
bo
bs
bt,libicu,dos2unix
bt,libicu,dos2unix,libxml2
btl
cc
cd
@ -107,7 +107,7 @@ sfc,ncurses-libs.i686
sof2
sol
squad
st
st,libxml2
stn
sven
terraria

Can't render this file because it has a wrong number of fields in line 2.

2
lgsm/data/serverlist.csv

@ -1,6 +1,6 @@
ac,acserver,Assetto Corsa,ubuntu-22.04
ahl,ahlserver,Action Half-Life,ubuntu-22.04
ahl2,ahl2server,Action: Source,ubuntu-22.04
ahl2,ahl2server,Action: Source,ubuntu-20.04
ark,arkserver,ARK: Survival Evolved,ubuntu-22.04
arma3,arma3server,ARMA 3,ubuntu-22.04
armar,armarserver,Arma Reforger,ubuntu-20.04

1 ac acserver Assetto Corsa ubuntu-22.04
2 ahl ahlserver Action Half-Life ubuntu-22.04
3 ahl2 ahl2server Action: Source ubuntu-22.04 ubuntu-20.04
4 ark arkserver ARK: Survival Evolved ubuntu-22.04
5 arma3 arma3server ARMA 3 ubuntu-22.04
6 armar armarserver Arma Reforger ubuntu-20.04

4
lgsm/data/ubuntu-16.04.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/ubuntu-18.04.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/ubuntu-20.04.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/ubuntu-21.04.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/ubuntu-21.10.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/ubuntu-22.04.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/data/ubuntu-23.04.csv

@ -16,7 +16,7 @@ bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
@ -107,7 +107,7 @@ sfc,libtinfo5:i386
sof2
sol
squad
st
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria

Can't render this file because it has a wrong number of fields in line 2.

4
lgsm/modules/check.sh

@ -21,7 +21,7 @@ fi
check_tmuxception.sh
if [ "$(whoami)" != "root" ] || [ -f /.dockerenv ]; then
if [ "$(whoami)" != "root" ]; then
if [ "${commandname}" != "MONITOR" ]; then
check_permissions.sh
fi
@ -38,7 +38,7 @@ for allowed_command in "${allowed_commands_array[@]}"; do
fi
done
if [ "$(whoami)" != "root" ] || [ -f /.dockerenv ]; then
if [ "$(whoami)" != "root" ]; then
allowed_commands_array=(DEBUG START INSTALL)
for allowed_command in "${allowed_commands_array[@]}"; do
if [ "${allowed_command}" == "${commandname}" ]; then

2
lgsm/modules/check_deps.sh

@ -301,7 +301,7 @@ fn_deps_detector() {
}
if [ "${commandname}" == "INSTALL" ]; then
if [ "$(whoami)" == "root" ] && [ ! -f /.dockerenv ]; then
if [ "$(whoami)" == "root" ]; then
echo -e ""
echo -e "${lightyellow}Checking Dependencies as root${default}"
echo -e "================================="

4
lgsm/modules/check_permissions.sh

@ -223,8 +223,8 @@ fn_sys_perm_error_process() {
fi
}
## Run permisions checks when not root or docker.
if [ "$(whoami)" != "root" ] && [ ! -f /.dockerenv ]; then
## Run permisions checks when not root.
if [ "$(whoami)" != "root" ]; then
fn_check_ownership
fn_check_permissions
if [ "${commandname}" == "START" ]; then

2
lgsm/modules/check_root.sh

@ -7,7 +7,7 @@
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
if [ "$(whoami)" == "root" ] && [ ! -f /.dockerenv ]; then
if [ "$(whoami)" == "root" ]; then
if [ "${commandname}" != "INSTALL" ]; then
fn_print_fail_nl "Do NOT run this script as root!"
if [ -d "${lgsmlogdir}" ]; then

2
lgsm/modules/command_install.sh

@ -11,7 +11,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_firstcommand_set
check.sh
if [ "$(whoami)" == "root" ] && [ ! -f /.dockerenv ]; then
if [ "$(whoami)" == "root" ]; then
check_deps.sh
else
install_header.sh

2
lgsm/modules/core_exit.sh

@ -18,7 +18,7 @@ fn_exit_dev_debug() {
}
# If running dependency check as root will remove any files that belong to root user.
if [ "$(whoami)" == "root" ] && [ ! -f /.dockerenv ]; then
if [ "$(whoami)" == "root" ]; then
find "${lgsmdir}"/ -group root -prune -exec rm -rf {} + > /dev/null 2>&1
find "${logdir}"/ -group root -prune -exec rm -rf {} + > /dev/null 2>&1
fi

2
lgsm/modules/core_functions.sh

@ -8,7 +8,7 @@
module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v23.3.4"
modulesversion="v23.3.5"
# Core

2
lgsm/modules/core_getopt.sh

@ -22,7 +22,7 @@ cmd_update_linuxgsm=("ul;update-lgsm;uf;update-modules" "command_update_linuxgsm
cmd_test_alert=("ta;test-alert" "command_test_alert.sh" "Send a test alert.")
cmd_monitor=("m;monitor" "command_monitor.sh" "Check server status and restart if crashed.")
cmd_skeleton=("sk;skeleton" "command_skeleton.sh" "Create a skeleton directory.")
cmd_sponso=("s;sponsor" "command_sponsor.sh" "Donation options.")
cmd_sponsor=("s;sponsor" "command_sponsor.sh" "Donation options.")
cmd_send=("sd;send" "command_send.sh" "Send command to game server console.")
# Console servers only.
cmd_console=("c;console" "command_console.sh" "Access server console.")

2
lgsm/modules/core_modules.sh

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

32
lgsm/modules/info_game.sh

@ -613,30 +613,29 @@ fn_info_game_pz() {
worldname="${worldname:-"NOT SET"}"
}
# Config Type: ini
# Parameters: true
# Comment: ; or #
# Example: SERVERNAME=SERVERNAME
# Filetype: ini
# Config Type: xml
# Comment: <!-- -->
# Example: <ServerName>SERVERNAME</ServerName>
# Filetype: xml
fn_info_game_st() {
if [ -f "${servercfgfullpath}" ]; then
fn_info_game_ini "maxplayers" "MAXPLAYER"
fn_info_game_ini "rconpassword" "RCONPASSWORD"
fn_info_game_ini "servername" "SERVERNAME"
fn_info_game_ini "serverpassword" "PASSWORD"
fn_info_game_xml "adminpassword" "/SettingData/AdminPassword"
fn_info_game_xml "maxplayers" "/SettingData/ServerMaxPlayers"
fn_info_game_xml "port" "/SettingData/GamePort"
fn_info_game_xml "queryport" "/SettingData/UpdatePort"
fn_info_game_xml "saveinterval" "/SettingData/SaveInterval"
fn_info_game_xml "servername" "/SettingData/ServerName"
fn_info_game_xml "serverpassword" "/SettingData/ServerPassword"
fi
clearinterval="${clearinterval:-"0"}"
httpport="${port:-"0"}"
adminpassword="${adminpassword:-"NOT SET"}"
maxplayers="${maxplayers:-"0"}"
port="${port:-"0"}"
queryport="${queryport:-"0"}"
rconpassword="${rconpassword:-"NOT SET"}"
saveinterval="${saveinterval:-"0"}"
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
worldname="${worldname:-"NOT SET"}"
worldtype="${worldtype:-"NOT SET"}"
}
# Config Type: ini
@ -911,7 +910,7 @@ fn_info_game_bf1942() {
# Comment: ; or #
# Example: ServerName=SERVERNAME
# Filetype: ini
fn_info_game_ct(){
fn_info_game_ct() {
if [ -f "${servercfgfullpath}" ]; then
fn_info_game_ini "configip" "bindAddress"
fn_info_game_ini "gamemode" "gameMode"
@ -1194,6 +1193,7 @@ fn_info_game_etl() {
configip="${configip:-"0.0.0.0"}"
maxplayers="${maxplayers:-"0"}"
port="${port:-"0"}"
queryport="${port}"
rconpassword="${rconpassword:-"NOT SET"}"
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
@ -1240,7 +1240,7 @@ fn_info_game_hw() {
port="${port:-"0"}"
queryport="${queryport:-"0"}"
maxplayers="${maxplayers:-"0"}"
# #4189 option setting can be blank
# #4189 option setting can be blank
# defaultmap="${defaultmap:-"NOT SET"}"
creativemode="${creativemode:-"NOT SET"}"
}
@ -1482,7 +1482,7 @@ fn_info_game_nec() {
# Comment: ; or #
# Example: ServerName=SERVERNAME
# Filetype: ini
fn_info_game_ohd(){
fn_info_game_ohd() {
if [ -f "${servercfgfullpath}" ]; then
fn_info_game_ini rconenabled "bEnabled"
fn_info_game_ini rconport "ListenPort"

13
lgsm/modules/info_messages.sh

@ -969,7 +969,7 @@ fn_info_message_csgo() {
} | column -s $'\t' -t
}
fn_info_message_ct(){
fn_info_message_ct() {
fn_info_message_password_strip
{
fn_port "header"
@ -977,7 +977,7 @@ fn_info_message_ct(){
} | column -s $'\t' -t
}
fn_info_message_dayz(){
fn_info_message_dayz() {
{
fn_port "header"
fn_port "Game" port udp
@ -1037,7 +1037,7 @@ fn_info_message_goldsrc() {
} | column -s $'\t' -t
}
fn_info_message_hcu(){
fn_info_message_hcu() {
{
fn_port "header"
fn_port "Game" port udp
@ -1504,13 +1504,6 @@ fn_info_message_st() {
fn_port "header"
fn_port "Game" port udp
fn_port "Query" queryport udp
fn_port "Web Interface" httpport tcp
} | column -s $'\t' -t
echo -e ""
echo -e "${lightgreen}${gamename} Web Interface${default}"
fn_messages_separator
{
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}"
} | column -s $'\t' -t
}

9
lgsm/modules/install_config.sh

@ -383,7 +383,7 @@ elif [ "${shortname}" == "css" ]; then
fn_list_config_locations
elif [ "${shortname}" == "ct" ]; then
gamedirname="Craftopia"
array_configs+=( ServerSetting.ini )
array_configs+=(ServerSetting.ini)
fn_fetch_default_config
fn_default_config_remote
fn_set_config_vars
@ -791,13 +791,6 @@ elif [ "${shortname}" == "sb" ]; then
fn_default_config_remote
fn_set_config_vars
fn_list_config_locations
elif [ "${shortname}" == "st" ]; then
gamedirname="Stationeers"
array_configs+=(default.ini)
fn_fetch_default_config
fn_default_config_remote
fn_set_config_vars
fn_list_config_locations
elif [ "${shortname}" == "stn" ]; then
gamedirname="SurvivetheNights"
array_configs+=(ServerConfig.txt ServerUsers.txt TpPresets.json UserPermissions.json)

10
linuxgsm.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v23.3.4"
version="v23.3.5"
shortname="core"
gameservername="core"
commandname="CORE"
@ -28,17 +28,17 @@ rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
selfname=$(basename "$(readlink -f "${BASH_SOURCE[0]}")")
sessionname=$(echo "${selfname}" | cut -f1 -d".")
lgsmdir="${rootdir}/lgsm"
logdir="${rootdir}/log"
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
lgsmlogdir="${logdir}/lgsm"
steamcmddir="${HOME}/.steam/steamcmd"
serverfiles="${rootdir}/serverfiles"
[ -n "${LGSM_SERVERFILES}" ] && serverfiles="${LGSM_SERVERFILES}" || serverfiles="${rootdir}/serverfiles"
modulesdir="${lgsmdir}/modules"
tmpdir="${lgsmdir}/tmp"
datadir="${lgsmdir}/data"
lockdir="${lgsmdir}/lock"
serverlist="${datadir}/serverlist.csv"
serverlistmenu="${datadir}/serverlistmenu.csv"
configdir="${lgsmdir}/config-lgsm"
[ -n "${LGSM_CONFIG}" ] && configdir="${LGSM_CONFIG}" || configdir="${lgsmdir}/config-lgsm"
configdirserver="${configdir}/${gameservername}"
configdirdefault="${lgsmdir}/config-default"
userinput="${1}"
@ -321,7 +321,7 @@ fn_install_file() {
}
# Prevent LinuxGSM from running as root. Except if doing a dependency install.
if [ "$(whoami)" == "root" ] && [ ! -f /.dockerenv ]; then
if [ "$(whoami)" == "root" ]; then
if [ "${userinput}" == "install" ] || [ "${userinput}" == "auto-install" ] || [ "${userinput}" == "i" ] || [ "${userinput}" == "ai" ]; then
if [ "${shortname}" == "core" ]; then
echo -e "[ FAIL ] Do NOT run this script as root!"

2
tests/tests_fctrserver.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v23.3.4"
version="v23.3.5"
shortname="fctr"
gameservername="fctrserver"
commandname="CORE"

2
tests/tests_jc2server.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v23.3.4"
version="v23.3.5"
shortname="jc2"
gameservername="jc2server"
commandname="CORE"

2
tests/tests_mcserver.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v23.3.4"
version="v23.3.5"
shortname="mc"
gameservername="mcserver"
commandname="CORE"

2
tests/tests_ts3server.sh

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi
version="v23.3.4"
version="v23.3.5"
shortname="ts3"
gameservername="ts3server"
commandname="CORE"

Loading…
Cancel
Save