Browse Source
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
pull/3484/head
Daniel Gibbs
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
21 additions and
2 deletions
-
lgsm/functions/check_deps.sh
-
lgsm/functions/info_distro.sh
-
lgsm/functions/info_messages.sh
|
|
@ -414,8 +414,20 @@ fn_deps_build_debian(){ |
|
|
|
# Hurtword/Rust |
|
|
|
elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then |
|
|
|
array_deps_required+=( lib32z1 ) |
|
|
|
# Minecraft, Rising World, Wurm |
|
|
|
elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]||[ "${shortname}" == "rw" ]; then |
|
|
|
# Minecraft, Rising World |
|
|
|
elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "pmc" ]||[ "${shortname}" == "wmc" ]; then |
|
|
|
javaversion=$(java -version 2>&1 | grep "version") |
|
|
|
if [ "${javaversion}" ]; then |
|
|
|
# Added for users using Oracle JRE to bypass the check. |
|
|
|
javacheck=1 |
|
|
|
else |
|
|
|
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 |
|
|
|
array_deps_required+=( openjdk-16-jre ) |
|
|
|
else |
|
|
|
array_deps_required+=( default-jre ) |
|
|
|
fi |
|
|
|
fi |
|
|
|
elif [ "${shortname}" == "rw" ]; then |
|
|
|
javaversion=$(java -version 2>&1 | grep "version") |
|
|
|
if [ "${javaversion}" ]; then |
|
|
|
# Added for users using Oracle JRE to bypass the check. |
|
|
|
|
|
@ -83,6 +83,10 @@ else |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
if [ "$(command -V java 2>/dev/null)" ]; then |
|
|
|
javaversion=$(java -version 2>&1 | grep "version") |
|
|
|
fi |
|
|
|
|
|
|
|
## Uptime |
|
|
|
uptime=$(</proc/uptime) |
|
|
|
uptime=${uptime/[. ]*/} |
|
|
|
|
|
@ -100,6 +100,9 @@ fn_info_message_distro(){ |
|
|
|
echo -e "${lightblue}Uptime:\t${default}${days}d, ${hours}h, ${minutes}m" |
|
|
|
echo -e "${lightblue}tmux:\t${default}${tmuxv}" |
|
|
|
echo -e "${lightblue}glibc:\t${default}${glibcversion}" |
|
|
|
if [ -n "${javaram}" ]; then |
|
|
|
echo -e "${lightblue}Java:\t${default}${javaversion}" |
|
|
|
fi |
|
|
|
} | column -s $'\t' -t |
|
|
|
} |
|
|
|
|
|
|
|