gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'hotfix/v24.2.1'

feature/786-online-players-check v24.2.1
Daniel Gibbs 1 year ago
parent
5510a30aee 0b8a223723
commit
1522cbd7b3
No known key found for this signature in database GPG Key ID: 2076B128385E8C55
18 changed files with 203 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .github/workflows/add-to-project.yml
  2. 8
      lgsm/data/almalinux-8.csv
  3. 12
      lgsm/data/almalinux-9.csv
  4. 2
      lgsm/data/centos-7.csv
  5. 2
      lgsm/data/centos-8.csv
  6. 4
      lgsm/data/centos-9.csv
  7. 12
      lgsm/data/rhel-8.csv
  8. 12
      lgsm/data/rhel-9.csv
  9. 12
      lgsm/data/rocky-8.csv
  10. 12
      lgsm/data/rocky-9.csv
  11. 10
      lgsm/data/ubuntu-20.04.csv
  12. 12
      lgsm/data/ubuntu-22.04.csv
  13. 12
      lgsm/data/ubuntu-23.04.csv
  14. 12
      lgsm/data/ubuntu-23.10.csv
  15. 138
      lgsm/data/ubuntu-24.04.csv
  16. 2
      lgsm/modules/core_modules.sh
  17. 2
      lgsm/modules/update_mc.sh
  18. 2
      linuxgsm.sh

2
.github/workflows/add-to-project.yml
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Add to Project - name: Add to Project
uses: actions/[email protected].0 uses: actions/[email protected].1
with: with:
project-url: https://github.com/orgs/GameServerManagers/projects/11 project-url: https://github.com/orgs/GameServerManagers/projects/11
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

8
lgsm/data/almalinux-8.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-17-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686
@ -82,7 +82,7 @@ onset,mariadb-connector-c
opfor opfor
pc pc
pc2 pc2
pmc,java-17-openjdk pmc,java-21-openjdk
ps,GConf2 ps,GConf2
pvkii pvkii
pvr,libcxx pvr,libcxx
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,glibc-devel vh,glibc-devel
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,java-17-openjdk vpmc,java-21-openjdk
vs vs
wet wet
wf wf
wmc,java-17-openjdk wmc,java-21-openjdk
wurm,xorg-x11-server-Xvfb wurm,xorg-x11-server-Xvfb
zmr,ncurses-libs.i686 zmr,ncurses-libs.i686
zps,ncurses-libs.i686 zps,ncurses-libs.i686

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

12
lgsm/data/almalinux-9.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-17-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686
@ -82,12 +82,12 @@ onset,mariadb-connector-c
opfor opfor
pc pc
pc2 pc2
pmc,java-17-openjdk pmc,java-21-openjdk
ps,GConf2 ps,GConf2
pvkii pvkii
pvr,libcxx pvr,libcxx
pw pw
pz,java-11-openjdk rng-tools pz,java-21-openjdk rng-tools
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,zlib-devel rust,zlib-devel
rw,java-11-openjdk rw,java-21-openjdk
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,glibc-devel vh,glibc-devel
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,java-17-openjdk vpmc,java-21-openjdk
vs vs
wet wet
wf wf
wmc,java-17-openjdk wmc,java-21-openjdk
wurm,xorg-x11-server-Xvfb wurm,xorg-x11-server-Xvfb
zmr,ncurses-libs.i686 zmr,ncurses-libs.i686
zps,ncurses-libs.i686 zps,ncurses-libs.i686

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

2
lgsm/data/centos-7.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-11-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686

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

2
lgsm/data/centos-8.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-17-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686

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

4
lgsm/data/centos-9.csv
View File

@ -87,7 +87,7 @@ ps,GConf2
pvkii pvkii
pvr,libcxx pvr,libcxx
pw pw
pz,java-11-openjdk rng-tools pz,java-21-openjdk rng-tools
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,zlib-devel rust,zlib-devel
rw,java-11-openjdk rw,java-21-openjdk
samp samp
sb sb
sbots sbots

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

12
lgsm/data/rhel-8.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-17-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686
@ -82,12 +82,12 @@ onset,mariadb-connector-c
opfor opfor
pc pc
pc2 pc2
pmc,java-17-openjdk pmc,java-21-openjdk
ps,GConf2 ps,GConf2
pvkii pvkii
pvr,libcxx pvr,libcxx
pw pw
pz,java-11-openjdk rng-tools pz,java-21-openjdk rng-tools
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,zlib-devel rust,zlib-devel
rw,java-11-openjdk rw,java-21-openjdk
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,glibc-devel vh,glibc-devel
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,java-17-openjdk vpmc,java-21-openjdk
vs vs
wet wet
wf wf
wmc,java-17-openjdk wmc,java-21-openjdk
wurm,xorg-x11-server-Xvfb wurm,xorg-x11-server-Xvfb
zmr,ncurses-libs.i686 zmr,ncurses-libs.i686
zps,ncurses-libs.i686 zps,ncurses-libs.i686

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

12
lgsm/data/rhel-9.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-17-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686
@ -82,12 +82,12 @@ onset,mariadb-connector-c
opfor opfor
pc pc
pc2 pc2
pmc,java-17-openjdk pmc,java-21-openjdk
ps,GConf2 ps,GConf2
pvkii pvkii
pvr,libcxx pvr,libcxx
pw pw
pz,java-11-openjdk rng-tools pz,java-21-openjdk rng-tools
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,zlib-devel rust,zlib-devel
rw,java-11-openjdk rw,java-21-openjdk
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,glibc-devel vh,glibc-devel
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,java-17-openjdk vpmc,java-21-openjdk
vs vs
wet wet
wf wf
wmc,java-17-openjdk wmc,java-21-openjdk
wurm,xorg-x11-server-Xvfb wurm,xorg-x11-server-Xvfb
zmr,ncurses-libs.i686 zmr,ncurses-libs.i686
zps,ncurses-libs.i686 zps,ncurses-libs.i686

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

12
lgsm/data/rocky-8.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-17-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686
@ -82,12 +82,12 @@ onset,mariadb-connector-c
opfor opfor
pc pc
pc2 pc2
pmc,java-17-openjdk pmc,java-21-openjdk
ps,GConf2 ps,GConf2
pvkii pvkii
pvr,libcxx pvr,libcxx
pw pw
pz,java-11-openjdk rng-tools pz,java-21-openjdk rng-tools
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,zlib-devel rust,zlib-devel
rw,java-11-openjdk rw,java-21-openjdk
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,glibc-devel vh,glibc-devel
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,java-17-openjdk vpmc,java-21-openjdk
vs vs
wet wet
wf wf
wmc,java-17-openjdk wmc,java-21-openjdk
wurm,xorg-x11-server-Xvfb wurm,xorg-x11-server-Xvfb
zmr,ncurses-libs.i686 zmr,ncurses-libs.i686
zps,ncurses-libs.i686 zps,ncurses-libs.i686

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

12
lgsm/data/rocky-9.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,java-17-openjdk mc,java-21-openjdk
mcb,libnsl mcb,libnsl
mh mh
mohaa,compat-libstdc++-33.i686 mohaa,compat-libstdc++-33.i686
@ -82,12 +82,12 @@ onset,mariadb-connector-c
opfor opfor
pc pc
pc2 pc2
pmc,java-17-openjdk pmc,java-21-openjdk
ps,GConf2 ps,GConf2
pvkii pvkii
pvr,libcxx pvr,libcxx
pw pw
pz,java-11-openjdk rng-tools pz,java-21-openjdk rng-tools
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,zlib-devel rust,zlib-devel
rw,java-11-openjdk rw,java-21-openjdk
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,glibc-devel vh,glibc-devel
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,java-17-openjdk vpmc,java-21-openjdk
vs vs
wet wet
wf wf
wmc,java-17-openjdk wmc,java-21-openjdk
wurm,xorg-x11-server-Xvfb wurm,xorg-x11-server-Xvfb
zmr,ncurses-libs.i686 zmr,ncurses-libs.i686
zps,ncurses-libs.i686 zps,ncurses-libs.i686

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

10
lgsm/data/ubuntu-20.04.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,openjdk-17-jre mc,openjdk-21-jre
mcb mcb
mh mh
mohaa,libstdc++5:i386 mohaa,libstdc++5:i386
@ -82,12 +82,12 @@ onset,libmariadb-dev
opfor opfor
pc pc
pc2 pc2
pmc,openjdk-17-jre pmc,openjdk-21-jre
ps,libgconf-2-4 ps,libgconf-2-4
pvkii pvkii
pvr,libc++1 pvr,libc++1
pw pw
pz,openjdk-17-jre,rng-tools pz,openjdk-21-jre,rng-tools
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,lib32z1 rust,lib32z1
rw,openjdk-17-jre rw,openjdk-21-jre
samp samp
sb sb
sbots sbots
@ -132,7 +132,7 @@ vpmc,openjdk-11-jre
vs vs
wet wet
wf wf
wmc,openjdk-17-jre wmc,openjdk-21-jre
wurm,xvfb wurm,xvfb
zmr,libtinfo5:i386 zmr,libtinfo5:i386
zps,libtinfo5:i386 zps,libtinfo5:i386

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

12
lgsm/data/ubuntu-22.04.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,openjdk-17-jre mc,openjdk-21-jre
mcb mcb
mh mh
mohaa,libstdc++5:i386 mohaa,libstdc++5:i386
@ -82,12 +82,12 @@ onset,libmariadb-dev
opfor opfor
pc pc
pc2 pc2
pmc,openjdk-17-jre pmc,openjdk-21-jre
ps,libgconf-2-4 ps,libgconf-2-4
pvkii pvkii
pvr,libc++1 pvr,libc++1
pw pw
pz,openjdk-17-jre,rng-tools5 pz,openjdk-21-jre,rng-tools5
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,lib32z1 rust,lib32z1
rw,openjdk-17-jre rw,openjdk-21-jre
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,libc6-dev vh,libc6-dev
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,openjdk-17-jre vpmc,openjdk-21-jre
vs vs
wet wet
wf wf
wmc,openjdk-17-jre wmc,openjdk-21-jre
wurm,xvfb wurm,xvfb
zmr,libtinfo5:i386 zmr,libtinfo5:i386
zps,libtinfo5:i386 zps,libtinfo5:i386

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

12
lgsm/data/ubuntu-23.04.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,openjdk-17-jre mc,openjdk-21-jre
mcb mcb
mh mh
mohaa,libstdc++5:i386 mohaa,libstdc++5:i386
@ -82,12 +82,12 @@ onset,libmariadb-dev
opfor opfor
pc pc
pc2 pc2
pmc,openjdk-17-jre pmc,openjdk-21-jre
ps,libgconf-2-4 ps,libgconf-2-4
pvkii pvkii
pvr,libc++1 pvr,libc++1
pw pw
pz,openjdk-17-jre,rng-tools5 pz,openjdk-21-jre,rng-tools5
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,lib32z1 rust,lib32z1
rw,openjdk-17-jre rw,openjdk-21-jre
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,libc6-dev vh,libc6-dev
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,openjdk-17-jre vpmc,openjdk-21-jre
vs vs
wet wet
wf wf
wmc,openjdk-17-jre wmc,openjdk-21-jre
wurm,xvfb wurm,xvfb
zmr,libtinfo5:i386 zmr,libtinfo5:i386
zps,libtinfo5:i386 zps,libtinfo5:i386

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

12
lgsm/data/ubuntu-23.10.csv
View File

@ -65,7 +65,7 @@ kf
kf2 kf2
l4d l4d
l4d2 l4d2
mc,openjdk-17-jre mc,openjdk-21-jre
mcb mcb
mh mh
mohaa,libstdc++5:i386 mohaa,libstdc++5:i386
@ -82,12 +82,12 @@ onset,libmariadb-dev
opfor opfor
pc pc
pc2 pc2
pmc,openjdk-17-jre pmc,openjdk-21-jre
ps,libgconf-2-4 ps,libgconf-2-4
pvkii pvkii
pvr,libc++1 pvr,libc++1
pw pw
pz,openjdk-17-jre,rng-tools5 pz,openjdk-21-jre,rng-tools5
q2 q2
q3 q3
q4 q4
@ -97,7 +97,7 @@ ricochet
ro ro
rtcw rtcw
rust,lib32z1 rust,lib32z1
rw,openjdk-17-jre rw,openjdk-21-jre
samp samp
sb sb
sbots sbots
@ -128,11 +128,11 @@ ut3
ut99 ut99
vh,libc6-dev vh,libc6-dev
vints,aspnetcore-runtime-7.0 vints,aspnetcore-runtime-7.0
vpmc,openjdk-17-jre vpmc,openjdk-21-jre
vs vs
wet wet
wf wf
wmc,openjdk-17-jre wmc,openjdk-21-jre
wurm,xvfb wurm,xvfb
zmr,libtinfo5:i386 zmr,libtinfo5:i386
zps,libtinfo5:i386 zps,libtinfo5:i386

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

138
lgsm/data/ubuntu-24.04.csv
View File

@ -0,0 +1,138 @@
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat-openbsd,pigz,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
ac
ahl
ahl2
ark
arma3
armar,libcurl4
ats
av
bb
bb2,libcurl4-gnutls-dev:i386
bd
bf1942,libncurses5:i386,libtinfo5:i386
bfv,libncurses5:i386,libstdc++5:i386
bmdm,libncurses5:i386
bo
bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
cod2,libstdc++5:i386
cod4
coduo,libstdc++5:i386
codwaw
col
cs
cs2
cscz
csgo
css,libtinfo5:i386
ct
dab
dayz
dmc
dod
dodr
dods
doi
dst,libcurl4-gnutls-dev:i386
dys
eco,libgdiplus
em
etl
ets2
fctr
fof
gmod,libtinfo5:i386
hcu
hl2dm
hldm
hldms
hw,lib32z1
hz
ins
inss
ios
jc2
jc3
jk2
kf
kf2
l4d
l4d2
mc,openjdk-21-jre
mcb
mh
mohaa,libstdc++5:i386
mom
mta,libncursesw5,libxml2-utils
nd
nec
nmrih,libtinfo5:i386
ns
ns2,speex,libtbb2
ns2c,speex:i386,libtbb2
ohd
onset,libmariadb-dev
opfor
pc
pc2
pmc,openjdk-21-jre
ps,libgconf-2-4
pvkii
pvr,libc++1
pw
pz,openjdk-21-jre,rng-tools5
q2
q3
q4
ql
qw
ricochet
ro
rtcw
rust,lib32z1
rw,openjdk-21-jre
samp
sb
sbots
scpsl,mono-complete
scpslsm,mono-complete
sdtd,telnet,expect,libxml2-utils
sf
sfc,libtinfo5:i386
sof2
sol
squad
st,libxml2-utils
stn
sven,libssl1.1:i386,zlib1g:i386
terraria
tf
tf2,libcurl4-gnutls-dev:i386
tfc
ti
ts
ts3
tu
tw
unt
ut
ut2k4
ut3
ut99
vh,libc6-dev
vints,aspnetcore-runtime-7.0
vpmc,openjdk-21-jre
vs
wet
wf
wmc,openjdk-21-jre
wurm,xvfb
zmr,libtinfo5:i386
zps,libtinfo5:i386
Can't render this file because it has a wrong number of fields in line 2.

2
lgsm/modules/core_modules.sh
View File

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

2
lgsm/modules/update_mc.sh
View File

@ -10,7 +10,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_update_dl() { fn_update_dl() {
# Download and extract files to serverfiles. # Download and extract files to serverfiles.
fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "${remotebuildfilename}" "chmodx" "norun" "noforce" "nohash" fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "${remotebuildfilename}" "chmodx" "norun" "noforce" "nohash"
cp -f "${tmpdir}/${remotebuildfilename}" "${serverfiles}/${executable#./}" cp -f "${tmpdir}/${remotebuildfilename}" "${serverfiles}/minecraft_server.jar"
fn_clear_tmp fn_clear_tmp
} }

2
linuxgsm.sh
View File

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

Write Preview
Loading…
Cancel
Save