From 18833adde1c5cdd19e286670bea97d7715ec26a3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 2 Dec 2021 21:08:31 +0000 Subject: [PATCH] feat(mc): update Minecraft java requirements (#3697) * update Minecraft Java requirements to Java 17 * fix: steamcmd depdencency check logic --- lgsm/data/debian-11.csv | 6 +- lgsm/data/ubuntu-20.04.csv | 6 +- lgsm/data/ubuntu-21.04.csv | 6 +- lgsm/data/ubuntu-21.10.csv | 123 +++++++++++++++++++++++++++++++++++ lgsm/data/ubuntu-22.04.csv | 123 +++++++++++++++++++++++++++++++++++ lgsm/functions/check_deps.sh | 8 ++- 6 files changed, 262 insertions(+), 10 deletions(-) create mode 100644 lgsm/data/ubuntu-21.10.csv create mode 100644 lgsm/data/ubuntu-22.04.csv diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv index 32d0c8b0d0..27dc5cb745 100644 --- a/lgsm/data/debian-11.csv +++ b/lgsm/data/debian-11.csv @@ -57,7 +57,7 @@ kf2 lo l4d l4d2 -mc,openjdk-16-jre +mc,openjdk-17-jre mcb mh mohaa,libstdc++5:i386 @@ -72,7 +72,7 @@ ns2c,speex:i386,libtbb2 onset,libmariadbclient-dev opfor pc -pmc,openjdk-16-jre +pmc,openjdk-17-jre pstbs,libgconf-2-4 pvkii pvr,libc++1 @@ -117,7 +117,7 @@ vs vints,mono-complete wet wf -wmc,openjdk-16-jre +wmc,openjdk-17-jre wurm,xvfb zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv index 96889c2ff7..c9fa981f09 100644 --- a/lgsm/data/ubuntu-20.04.csv +++ b/lgsm/data/ubuntu-20.04.csv @@ -57,7 +57,7 @@ kf2 lo l4d l4d2 -mc,openjdk-16-jre +mc,openjdk-17-jre mcb mh mohaa,libstdc++5:i386 @@ -72,7 +72,7 @@ ns2c,speex:i386,libtbb2 onset,libmariadbclient-dev opfor pc -pmc,openjdk-16-jre +pmc,openjdk-17-jre pstbs,libgconf-2-4 pvkii pvr,libc++1 @@ -117,7 +117,7 @@ vs vints,mono-complete wet wf -wmc,openjdk-16-jre +wmc,openjdk-17-jre wurm,xvfb zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-21.04.csv b/lgsm/data/ubuntu-21.04.csv index a0abc38253..a3ca2d84ef 100644 --- a/lgsm/data/ubuntu-21.04.csv +++ b/lgsm/data/ubuntu-21.04.csv @@ -57,7 +57,7 @@ kf2 lo l4d l4d2 -mc,openjdk-16-jre +mc,openjdk-17-jre mcb mh mohaa,libstdc++5:i386 @@ -72,7 +72,7 @@ ns2c,speex:i386,libtbb2 onset,libmariadbclient-dev opfor pc -pmc,openjdk-16-jre +pmc,openjdk-17-jre pstbs,libgconf-2-4 pvkii pvr,libc++1 @@ -117,7 +117,7 @@ vs vints,mono-complete wet wf -wmc,openjdk-16-jre +wmc,openjdk-17-jre wurm,xvfb zmr,libtinfo5:i386 zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-21.10.csv b/lgsm/data/ubuntu-21.10.csv new file mode 100644 index 0000000000..a3ca2d84ef --- /dev/null +++ b/lgsm/data/ubuntu-21.10.csv @@ -0,0 +1,123 @@ +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 +steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd +ac +ahl +ahl2 +ark +arma3 +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 +bt1944 +cc +cmw +cod,libstdc++5:i386 +cod2,libstdc++5:i386 +cod4 +coduo,libstdc++5:i386 +codwaw +col +cs +cscz +csgo +css,libtinfo5:i386 +dab +dmc +dod +dodr +dods +doi +dst,libcurl4-gnutls-dev:i386 +dys +eco,libgdiplus +em +etl +fctr +fof +gmod,libtinfo5:i386 +hl2dm +hldm +hldms +hw,lib32z1 +ins +inss +ios +jc2 +jc3 +jk2 +kf +kf2 +lo +l4d +l4d2 +mc,openjdk-17-jre +mcb +mh +mohaa,libstdc++5:i386 +mom +mta,libncursesw5 +mumble +nd +nmrih,libtinfo5:i386 +ns +ns2,speex,libtbb2 +ns2c,speex:i386,libtbb2 +onset,libmariadbclient-dev +opfor +pc +pmc,openjdk-17-jre +pstbs,libgconf-2-4 +pvkii +pvr,libc++1 +pz,openjdk-16-jre,rng-tools +q2 +q3 +ql +qw +ricochet +ro +rtcw +rust,lib32z1 +rw,openjdk-16-jre +samp +sb +sbots +scpsl,mono-complete +scpslsm,mono-complete +sdtd,telnet,expect +sfc,libtinfo5:i386 +sf +sof2 +sol +squad +st +stn +sven,libssl1.1:i386,zlib1g:i386 +terraria,libsdl +tf2,libcurl4-gnutls-dev:i386 +tfc +ts +ts3 +tu +tw +unt +ut +ut2k4 +ut3 +ut99 +vh,libc6-dev +vs +vints,mono-complete +wet +wf +wmc,openjdk-17-jre +wurm,xvfb +zmr,libtinfo5:i386 +zps,libtinfo5:i386 diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv new file mode 100644 index 0000000000..a3ca2d84ef --- /dev/null +++ b/lgsm/data/ubuntu-22.04.csv @@ -0,0 +1,123 @@ +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 +steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd +ac +ahl +ahl2 +ark +arma3 +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 +bt1944 +cc +cmw +cod,libstdc++5:i386 +cod2,libstdc++5:i386 +cod4 +coduo,libstdc++5:i386 +codwaw +col +cs +cscz +csgo +css,libtinfo5:i386 +dab +dmc +dod +dodr +dods +doi +dst,libcurl4-gnutls-dev:i386 +dys +eco,libgdiplus +em +etl +fctr +fof +gmod,libtinfo5:i386 +hl2dm +hldm +hldms +hw,lib32z1 +ins +inss +ios +jc2 +jc3 +jk2 +kf +kf2 +lo +l4d +l4d2 +mc,openjdk-17-jre +mcb +mh +mohaa,libstdc++5:i386 +mom +mta,libncursesw5 +mumble +nd +nmrih,libtinfo5:i386 +ns +ns2,speex,libtbb2 +ns2c,speex:i386,libtbb2 +onset,libmariadbclient-dev +opfor +pc +pmc,openjdk-17-jre +pstbs,libgconf-2-4 +pvkii +pvr,libc++1 +pz,openjdk-16-jre,rng-tools +q2 +q3 +ql +qw +ricochet +ro +rtcw +rust,lib32z1 +rw,openjdk-16-jre +samp +sb +sbots +scpsl,mono-complete +scpslsm,mono-complete +sdtd,telnet,expect +sfc,libtinfo5:i386 +sf +sof2 +sol +squad +st +stn +sven,libssl1.1:i386,zlib1g:i386 +terraria,libsdl +tf2,libcurl4-gnutls-dev:i386 +tfc +ts +ts3 +tu +tw +unt +ut +ut2k4 +ut3 +ut99 +vh,libc6-dev +vs +vints,mono-complete +wet +wf +wmc,openjdk-17-jre +wurm,xvfb +zmr,libtinfo5:i386 +zps,libtinfo5:i386 diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index e8fd3f991e..fab923bd74 100755 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -225,7 +225,13 @@ fn_deps_detector(){ ## Check. # SteamCMD: Will be removed from required array if no appid is present or non-free repo is not available. # This will cause SteamCMD to be installed using tar. - if [ "${deptocheck}" == "steamcmd" ]&&[ -z "${appid}" ]||[ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then + if [ "${deptocheck}" == "libsdl2-2.0-0:i386" ]&&[ -z "${appid}" ]; then + array_deps_required=( "${array_deps_required[@]/libsdl2-2.0-0:i386}" ) + steamcmdstatus=1 + elif [ "${deptocheck}" == "steamcmd" ]&&[ -z "${appid}" ]; then + array_deps_required=( "${array_deps_required[@]/steamcmd}" ) + steamcmdstatus=1 + elif [ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then array_deps_required=( "${array_deps_required[@]/steamcmd}" ) steamcmdstatus=1 # Java: Added for users using Oracle JRE to bypass check.