Skip to content

Commit 20c382d

Browse files
authored
Hotfix v21.2.4 (#3484)
* fix(mc): add Java 16 as a dependency requirement for Ubuntu 20.04 and above (#3482) * fix(steamcmd): resolve disk write failure bug (#3483)
2 parents 19ac561 + 54aa34a commit 20c382d

File tree

10 files changed

+34
-7
lines changed

10 files changed

+34
-7
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/check_steamcmd.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ if [ ${shortname} == "ark" ]; then
1717
fi
1818
fn_check_steamcmd_dir
1919
fn_check_steamcmd_dir_legacy
20+
fn_check_steamcmd_steamapp
2021
fn_check_steamcmd_user
2122
fn_check_steamcmd_exec

lgsm/functions/core_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
1010

11-
modulesversion="v21.2.3"
11+
modulesversion="v21.2.4"
1212

1313
# Core
1414

lgsm/functions/core_steamcmd.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ fn_check_steamcmd_dir_legacy(){
9797
fi
9898
}
9999

100+
fn_check_steamcmd_steamapp(){
101+
# Check that steamapp directory fixes issue #3481
102+
if [ ! -d "${serverfiles}/steamapps" ]; then
103+
mkdir -p "${serverfiles}/steamapps"
104+
fi
105+
}
106+
100107
fn_check_steamcmd_ark(){
101108
# Checks if SteamCMD exists in
102109
# Engine/Binaries/ThirdParty/SteamCMD/Linux

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

tests/tests_fctrserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.2.3"
23+
version="v21.2.4"
2424
shortname="fctr"
2525
gameservername="fctrserver"
2626
commandname="CORE"

tests/tests_jc2server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.2.3"
23+
version="v21.2.4"
2424
shortname="jc2"
2525
gameservername="jc2server"
2626
commandname="CORE"

tests/tests_mcserver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.2.3"
23+
version="v21.2.4"
2424
shortname="mc"
2525
gameservername="mcserver"
2626
commandname="CORE"

tests/tests_ts3server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
2020
set -x
2121
fi
2222

23-
version="v21.2.3"
23+
version="v21.2.4"
2424
shortname="ts3"
2525
gameservername="ts3server"
2626
commandname="CORE"

0 commit comments

Comments
 (0)