Skip to content

Commit 2a7fd6f

Browse files
authored
fix(mc): add Java 16 as a dependency requirement for Ubuntu 20.04 and above (#3482)
* Added java info to details for game servers that require it * added openjdk-16-jre option for Ubuntu server
1 parent 19ac561 commit 2a7fd6f

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

lgsm/functions/check_deps.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,20 @@ fn_deps_build_debian(){
414414
# Hurtword/Rust
415415
elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
416416
array_deps_required+=( lib32z1 )
417-
# Minecraft, Rising World, Wurm
418-
elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]||[ "${shortname}" == "rw" ]; then
417+
# Minecraft, Rising World
418+
elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]; then
419+
javaversion=$(java -version 2>&1 | grep "version")
420+
if [ "${javaversion}" ]; then
421+
# Added for users using Oracle JRE to bypass the check.
422+
javacheck=1
423+
else
424+
if { [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.04" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "21.04" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.04" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "20.10" ]; }||{ [ "${distroid}" == "pop" ]&&[ "${distroversion}" == "21.04" ]; }; then
425+
array_deps_required+=( openjdk-16-jre )
426+
else
427+
array_deps_required+=( default-jre )
428+
fi
429+
fi
430+
elif [ "${shortname}" == "rw" ]; then
419431
javaversion=$(java -version 2>&1 | grep "version")
420432
if [ "${javaversion}" ]; then
421433
# Added for users using Oracle JRE to bypass the check.

lgsm/functions/info_distro.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ else
8383
fi
8484
fi
8585

86+
if [ "$(command -V java 2>/dev/null)" ]; then
87+
javaversion=$(java -version 2>&1 | grep "version")
88+
fi
89+
8690
## Uptime
8791
uptime=$(</proc/uptime)
8892
uptime=${uptime/[. ]*/}

lgsm/functions/info_messages.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ fn_info_message_distro(){
100100
echo -e "${lightblue}Uptime:\t${default}${days}d, ${hours}h, ${minutes}m"
101101
echo -e "${lightblue}tmux:\t${default}${tmuxv}"
102102
echo -e "${lightblue}glibc:\t${default}${glibcversion}"
103+
if [ -n "${javaram}" ]; then
104+
echo -e "${lightblue}Java:\t${default}${javaversion}"
105+
fi
103106
} | column -s $'\t' -t
104107
}
105108

0 commit comments

Comments
 (0)