Browse Source

Merge branch 'develop' into 4696-bug-discord-alert-on-update-uses-the-old-version-not-the-new-one

pull/4854/head
Daniel Gibbs 4 months ago
committed by GitHub
parent
commit
00265e5cd5
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      lgsm/config-default/config-lgsm/hzserver/_default.cfg
  2. 2
      lgsm/data/debian-10.csv
  3. 2
      lgsm/data/debian-11.csv
  4. 2
      lgsm/data/debian-9.csv
  5. 4
      lgsm/data/serverlist.csv
  6. 2
      lgsm/data/ubuntu-16.04.csv
  7. 2
      lgsm/data/ubuntu-18.04.csv
  8. 2
      lgsm/data/ubuntu-20.04.csv
  9. 2
      lgsm/data/ubuntu-22.04.csv
  10. 2
      lgsm/data/ubuntu-23.04.csv
  11. 2
      lgsm/data/ubuntu-23.10.csv
  12. 2
      lgsm/data/ubuntu-24.04.csv
  13. 20
      lgsm/modules/check_deps.sh

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

@ -163,9 +163,9 @@ glibc="2.17"
# Edit with care # Edit with care
## Game Server Directories ## Game Server Directories
systemdir="${serverfiles}/TSSGame" systemdir="${serverfiles}/HumanitZServer"
executabledir="${systemdir}/Binaries/Linux" executabledir="${systemdir}/Binaries/Linux"
executable="./TSSGameServer-Linux-Shipping" executable="./HumanitZServer-Linux-Shipping"
servercfgdir="${systemdir}" servercfgdir="${systemdir}"
servercfg="GameServerSettings.ini" servercfg="GameServerSettings.ini"
servercfgdefault="GameUserSettings.ini" servercfgdefault="GameUserSettings.ini"

2
lgsm/data/debian-10.csv

@ -111,7 +111,7 @@ squad
st,libxml2-utils st,libxml2-utils
steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/debian-11.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/debian-9.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

4
lgsm/data/serverlist.csv

@ -110,7 +110,7 @@ squad,squadserver,Squad,ubuntu-24.04
squad44,squad44server,Squad 44,ubuntu-24.04 squad44,squad44server,Squad 44,ubuntu-24.04
st,stserver,Stationeers,ubuntu-24.04 st,stserver,Stationeers,ubuntu-24.04
stn,stnserver,Survive the Nights,ubuntu-24.04 stn,stnserver,Survive the Nights,ubuntu-24.04
sven,svenserver,Sven Co-op,ubuntu-20.04 sven,svenserver,Sven Co-op,ubuntu-24.04
terraria,terrariaserver,Terraria,ubuntu-24.04 terraria,terrariaserver,Terraria,ubuntu-24.04
tf,tfserver,The Front,ubuntu-24.04 tf,tfserver,The Front,ubuntu-24.04
tf2,tf2server,Team Fortress 2,ubuntu-24.04 tf2,tf2server,Team Fortress 2,ubuntu-24.04
@ -126,7 +126,7 @@ ut2k4,ut2k4server,Unreal Tournament 2004,ubuntu-24.04
ut3,ut3server,Unreal Tournament 3,ubuntu-24.04 ut3,ut3server,Unreal Tournament 3,ubuntu-24.04
ut99,ut99server,Unreal Tournament 99,ubuntu-24.04 ut99,ut99server,Unreal Tournament 99,ubuntu-24.04
vh,vhserver,Valheim,ubuntu-24.04 vh,vhserver,Valheim,ubuntu-24.04
vints,vintsserver,Vintage Story,ubuntu-22.04 vints,vintsserver,Vintage Story,ubuntu-24.04
vpmc,vpmcserver,Velocity Proxy MC,ubuntu-24.04 vpmc,vpmcserver,Velocity Proxy MC,ubuntu-24.04
vs,vsserver,Vampire Slayer,ubuntu-24.04 vs,vsserver,Vampire Slayer,ubuntu-24.04
wet,wetserver,Wolfenstein: Enemy Territory,ubuntu-24.04 wet,wetserver,Wolfenstein: Enemy Territory,ubuntu-24.04

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

2
lgsm/data/ubuntu-16.04.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/ubuntu-18.04.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/ubuntu-20.04.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/ubuntu-22.04.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/ubuntu-23.04.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/ubuntu-23.10.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

2
lgsm/data/ubuntu-24.04.csv

@ -111,7 +111,7 @@ sol
squad squad
st,libxml2-utils st,libxml2-utils
stn stn
sven,libssl1.1:i386,zlib1g:i386 sven,zlib1g:i386
terraria terraria
tf tf
tf2,libcurl4-gnutls-dev:i386 tf2,libcurl4-gnutls-dev:i386

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

20
lgsm/modules/check_deps.sh

@ -351,6 +351,8 @@ if [ "${commandname}" == "INSTALL" ]; then
fi fi
fi fi
info_distro.sh
# Will warn user if their distro is no longer supported by the vendor. # Will warn user if their distro is no longer supported by the vendor.
if [ -n "${distrosupport}" ]; then if [ -n "${distrosupport}" ]; then
if [ "${distrosupport}" == "unsupported" ]; then if [ "${distrosupport}" == "unsupported" ]; then
@ -359,7 +361,23 @@ if [ -n "${distrosupport}" ]; then
fi fi
fi fi
info_distro.sh # These titles are only supported up to Ubuntu 22.04 (Jammy) and Debian 12 (Bookworm).
if { [ "${distroid}" == "ubuntu" ] && dpkg --compare-versions "${distroversion}" "gt" "22.04"; } || { [ "${distroidlike}" == "debian" ] && dpkg --compare-versions "${distroversion}" "gt" "12"; }; then
if [ "${shortname}" == "bf1942" ] || [ "${shortname}" == "bfv" ]; then
fn_print_failure_nl "${gamename} is not supported on ${distroname} (requires Ubuntu <= 22.04 or Debian <= 12)."
fn_script_log_fail "${gamename} is not supported on ${distroname}."
core_exit.sh
fi
fi
# These titles are only supported up to Ubuntu 20.04 and Debian 11 (and Debian-like derivatives).
if { [ "${distroid}" == "ubuntu" ] && dpkg --compare-versions "${distroversion}" "gt" "20.04"; } || { [ "${distroidlike}" == "debian" ] && dpkg --compare-versions "${distroversion}" "gt" "11"; }; then
if [ "${shortname}" == "onset" ] || [ "${shortname}" == "btl" ]; then
fn_print_failure_nl "${gamename} is not supported on ${distroname} (requires Ubuntu <= 20.04 or Debian <= 11)."
fn_script_log_fail "${gamename} is not supported on ${distroname}."
core_exit.sh
fi
fi
if [ ! -f "${tmpdir}/dependency-no-check.tmp" ] && [ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then if [ ! -f "${tmpdir}/dependency-no-check.tmp" ] && [ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
# Check that the distro dependency csv file exists. # Check that the distro dependency csv file exists.

Loading…
Cancel
Save