Skip to content

Commit 18833ad

Browse files
dgibbs64dgibbs64
authored
feat(mc): update Minecraft java requirements (#3697)
* update Minecraft Java requirements to Java 17 * fix: steamcmd depdencency check logic
1 parent 7ae226a commit 18833ad

File tree

6 files changed

+262
-10
lines changed

6 files changed

+262
-10
lines changed

‎lgsm/data/debian-11.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ kf2
5757
lo
5858
l4d
5959
l4d2
60-
mc,openjdk-16-jre
60+
mc,openjdk-17-jre
6161
mcb
6262
mh
6363
mohaa,libstdc++5:i386
@@ -72,7 +72,7 @@ ns2c,speex:i386,libtbb2
7272
onset,libmariadbclient-dev
7373
opfor
7474
pc
75-
pmc,openjdk-16-jre
75+
pmc,openjdk-17-jre
7676
pstbs,libgconf-2-4
7777
pvkii
7878
pvr,libc++1
@@ -117,7 +117,7 @@ vs
117117
vints,mono-complete
118118
wet
119119
wf
120-
wmc,openjdk-16-jre
120+
wmc,openjdk-17-jre
121121
wurm,xvfb
122122
zmr,libtinfo5:i386
123123
zps,libtinfo5:i386

‎lgsm/data/ubuntu-20.04.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ kf2
5757
lo
5858
l4d
5959
l4d2
60-
mc,openjdk-16-jre
60+
mc,openjdk-17-jre
6161
mcb
6262
mh
6363
mohaa,libstdc++5:i386
@@ -72,7 +72,7 @@ ns2c,speex:i386,libtbb2
7272
onset,libmariadbclient-dev
7373
opfor
7474
pc
75-
pmc,openjdk-16-jre
75+
pmc,openjdk-17-jre
7676
pstbs,libgconf-2-4
7777
pvkii
7878
pvr,libc++1
@@ -117,7 +117,7 @@ vs
117117
vints,mono-complete
118118
wet
119119
wf
120-
wmc,openjdk-16-jre
120+
wmc,openjdk-17-jre
121121
wurm,xvfb
122122
zmr,libtinfo5:i386
123123
zps,libtinfo5:i386

‎lgsm/data/ubuntu-21.04.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ kf2
5757
lo
5858
l4d
5959
l4d2
60-
mc,openjdk-16-jre
60+
mc,openjdk-17-jre
6161
mcb
6262
mh
6363
mohaa,libstdc++5:i386
@@ -72,7 +72,7 @@ ns2c,speex:i386,libtbb2
7272
onset,libmariadbclient-dev
7373
opfor
7474
pc
75-
pmc,openjdk-16-jre
75+
pmc,openjdk-17-jre
7676
pstbs,libgconf-2-4
7777
pvkii
7878
pvr,libc++1
@@ -117,7 +117,7 @@ vs
117117
vints,mono-complete
118118
wet
119119
wf
120-
wmc,openjdk-16-jre
120+
wmc,openjdk-17-jre
121121
wurm,xvfb
122122
zmr,libtinfo5:i386
123123
zps,libtinfo5:i386

‎lgsm/data/ubuntu-21.10.csv

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
2+
steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
3+
ac
4+
ahl
5+
ahl2
6+
ark
7+
arma3
8+
av
9+
bb
10+
bb2,libcurl4-gnutls-dev:i386
11+
bd
12+
bf1942,libncurses5:i386,libtinfo5:i386
13+
bfv,libncurses5:i386,libstdc++5:i386
14+
bmdm,libncurses5:i386
15+
bo
16+
bs
17+
bt,libicu-dev
18+
bt1944
19+
cc
20+
cmw
21+
cod,libstdc++5:i386
22+
cod2,libstdc++5:i386
23+
cod4
24+
coduo,libstdc++5:i386
25+
codwaw
26+
col
27+
cs
28+
cscz
29+
csgo
30+
css,libtinfo5:i386
31+
dab
32+
dmc
33+
dod
34+
dodr
35+
dods
36+
doi
37+
dst,libcurl4-gnutls-dev:i386
38+
dys
39+
eco,libgdiplus
40+
em
41+
etl
42+
fctr
43+
fof
44+
gmod,libtinfo5:i386
45+
hl2dm
46+
hldm
47+
hldms
48+
hw,lib32z1
49+
ins
50+
inss
51+
ios
52+
jc2
53+
jc3
54+
jk2
55+
kf
56+
kf2
57+
lo
58+
l4d
59+
l4d2
60+
mc,openjdk-17-jre
61+
mcb
62+
mh
63+
mohaa,libstdc++5:i386
64+
mom
65+
mta,libncursesw5
66+
mumble
67+
nd
68+
nmrih,libtinfo5:i386
69+
ns
70+
ns2,speex,libtbb2
71+
ns2c,speex:i386,libtbb2
72+
onset,libmariadbclient-dev
73+
opfor
74+
pc
75+
pmc,openjdk-17-jre
76+
pstbs,libgconf-2-4
77+
pvkii
78+
pvr,libc++1
79+
pz,openjdk-16-jre,rng-tools
80+
q2
81+
q3
82+
ql
83+
qw
84+
ricochet
85+
ro
86+
rtcw
87+
rust,lib32z1
88+
rw,openjdk-16-jre
89+
samp
90+
sb
91+
sbots
92+
scpsl,mono-complete
93+
scpslsm,mono-complete
94+
sdtd,telnet,expect
95+
sfc,libtinfo5:i386
96+
sf
97+
sof2
98+
sol
99+
squad
100+
st
101+
stn
102+
sven,libssl1.1:i386,zlib1g:i386
103+
terraria,libsdl
104+
tf2,libcurl4-gnutls-dev:i386
105+
tfc
106+
ts
107+
ts3
108+
tu
109+
tw
110+
unt
111+
ut
112+
ut2k4
113+
ut3
114+
ut99
115+
vh,libc6-dev
116+
vs
117+
vints,mono-complete
118+
wet
119+
wf
120+
wmc,openjdk-17-jre
121+
wurm,xvfb
122+
zmr,libtinfo5:i386
123+
zps,libtinfo5:i386

‎lgsm/data/ubuntu-22.04.csv

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
2+
steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
3+
ac
4+
ahl
5+
ahl2
6+
ark
7+
arma3
8+
av
9+
bb
10+
bb2,libcurl4-gnutls-dev:i386
11+
bd
12+
bf1942,libncurses5:i386,libtinfo5:i386
13+
bfv,libncurses5:i386,libstdc++5:i386
14+
bmdm,libncurses5:i386
15+
bo
16+
bs
17+
bt,libicu-dev
18+
bt1944
19+
cc
20+
cmw
21+
cod,libstdc++5:i386
22+
cod2,libstdc++5:i386
23+
cod4
24+
coduo,libstdc++5:i386
25+
codwaw
26+
col
27+
cs
28+
cscz
29+
csgo
30+
css,libtinfo5:i386
31+
dab
32+
dmc
33+
dod
34+
dodr
35+
dods
36+
doi
37+
dst,libcurl4-gnutls-dev:i386
38+
dys
39+
eco,libgdiplus
40+
em
41+
etl
42+
fctr
43+
fof
44+
gmod,libtinfo5:i386
45+
hl2dm
46+
hldm
47+
hldms
48+
hw,lib32z1
49+
ins
50+
inss
51+
ios
52+
jc2
53+
jc3
54+
jk2
55+
kf
56+
kf2
57+
lo
58+
l4d
59+
l4d2
60+
mc,openjdk-17-jre
61+
mcb
62+
mh
63+
mohaa,libstdc++5:i386
64+
mom
65+
mta,libncursesw5
66+
mumble
67+
nd
68+
nmrih,libtinfo5:i386
69+
ns
70+
ns2,speex,libtbb2
71+
ns2c,speex:i386,libtbb2
72+
onset,libmariadbclient-dev
73+
opfor
74+
pc
75+
pmc,openjdk-17-jre
76+
pstbs,libgconf-2-4
77+
pvkii
78+
pvr,libc++1
79+
pz,openjdk-16-jre,rng-tools
80+
q2
81+
q3
82+
ql
83+
qw
84+
ricochet
85+
ro
86+
rtcw
87+
rust,lib32z1
88+
rw,openjdk-16-jre
89+
samp
90+
sb
91+
sbots
92+
scpsl,mono-complete
93+
scpslsm,mono-complete
94+
sdtd,telnet,expect
95+
sfc,libtinfo5:i386
96+
sf
97+
sof2
98+
sol
99+
squad
100+
st
101+
stn
102+
sven,libssl1.1:i386,zlib1g:i386
103+
terraria,libsdl
104+
tf2,libcurl4-gnutls-dev:i386
105+
tfc
106+
ts
107+
ts3
108+
tu
109+
tw
110+
unt
111+
ut
112+
ut2k4
113+
ut3
114+
ut99
115+
vh,libc6-dev
116+
vs
117+
vints,mono-complete
118+
wet
119+
wf
120+
wmc,openjdk-17-jre
121+
wurm,xvfb
122+
zmr,libtinfo5:i386
123+
zps,libtinfo5:i386

‎lgsm/functions/check_deps.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,13 @@ fn_deps_detector(){
225225
## Check.
226226
# SteamCMD: Will be removed from required array if no appid is present or non-free repo is not available.
227227
# This will cause SteamCMD to be installed using tar.
228-
if [ "${deptocheck}" == "steamcmd" ]&&[ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
228+
if [ "${deptocheck}" == "libsdl2-2.0-0:i386" ]&&[ -z "${appid}" ]; then
229+
array_deps_required=( "${array_deps_required[@]/libsdl2-2.0-0:i386}" )
230+
steamcmdstatus=1
231+
elif [ "${deptocheck}" == "steamcmd" ]&&[ -z "${appid}" ]; then
232+
array_deps_required=( "${array_deps_required[@]/steamcmd}" )
233+
steamcmdstatus=1
234+
elif [ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
229235
array_deps_required=( "${array_deps_required[@]/steamcmd}" )
230236
steamcmdstatus=1
231237
# Java: Added for users using Oracle JRE to bypass check.

0 commit comments

Comments
 (0)