File tree Expand file tree Collapse file tree 3 files changed +21
-2
lines changed Expand file tree Collapse file tree 3 files changed +21
-2
lines changed Original file line number Diff line number Diff line change @@ -414,8 +414,20 @@ fn_deps_build_debian(){
414
414
# Hurtword/Rust
415
415
elif [ " ${shortname} " == " hw" ]|| [ " ${shortname} " == " rust" ]; then
416
416
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
419
431
javaversion=$( java -version 2>&1 | grep " version" )
420
432
if [ " ${javaversion} " ]; then
421
433
# Added for users using Oracle JRE to bypass the check.
Original file line number Diff line number Diff line change 83
83
fi
84
84
fi
85
85
86
+ if [ " $( command -V java 2> /dev/null) " ]; then
87
+ javaversion=$( java -version 2>&1 | grep " version" )
88
+ fi
89
+
86
90
# # Uptime
87
91
uptime=$( < /proc/uptime)
88
92
uptime=${uptime/ [. ]*/ }
Original file line number Diff line number Diff line change @@ -100,6 +100,9 @@ fn_info_message_distro(){
100
100
echo -e " ${lightblue} Uptime:\t${default}${days} d, ${hours} h, ${minutes} m"
101
101
echo -e " ${lightblue} tmux:\t${default}${tmuxv} "
102
102
echo -e " ${lightblue} glibc:\t${default}${glibcversion} "
103
+ if [ -n " ${javaram} " ]; then
104
+ echo -e " ${lightblue} Java:\t${default}${javaversion} "
105
+ fi
103
106
} | column -s $' \t ' -t
104
107
}
105
108
You can’t perform that action at this time.
0 commit comments