Merge branch 'hotfix/v21.2.4'

lgsm/functions/check_deps.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.

lgsm/functions/check_steamcmd.sh

@@ -17,5 +17,6 @@ if [ ${shortname} == "ark" ]; then
 fi
 fn_check_steamcmd_dir
 fn_check_steamcmd_dir_legacy
+fn_check_steamcmd_steamapp
 fn_check_steamcmd_user
 fn_check_steamcmd_exec

lgsm/functions/core_functions.sh

@@ -8,7 +8,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v21.2.3"
+modulesversion="v21.2.4"
 
 # Core
 

lgsm/functions/core_steamcmd.sh

@@ -97,6 +97,13 @@ fn_check_steamcmd_dir_legacy(){
  fi
 }
 
+fn_check_steamcmd_steamapp(){
+ # Check that steamapp directory fixes issue #3481
+ if [ ! -d "${serverfiles}/steamapps" ]; then
+ mkdir -p "${serverfiles}/steamapps"
+ fi
+}
+
 fn_check_steamcmd_ark(){
  # Checks if SteamCMD exists in
  # Engine/Binaries/ThirdParty/SteamCMD/Linux

lgsm/functions/info_distro.sh

@@ -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/[. ]*/}

lgsm/functions/info_messages.sh

@@ -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
 }
 

tests/tests_fctrserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.3"
+version="v21.2.4"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.3"
+version="v21.2.4"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

tests/tests_mcserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.3"
+version="v21.2.4"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

tests/tests_ts3server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
  set -x
 fi
 
-version="v21.2.3"
+version="v21.2.4"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"