From 7fe992920c0591810cd162bfda6da363806f6889 Mon Sep 17 00:00:00 2001
From: Christian <h3o66@users.noreply.github.com>
Date: Sun, 20 Sep 2020 11:07:21 +0200
Subject: [PATCH] fix(wurm): fix server startup for wurm and dependency (#3046)

---
 lgsm/functions/check_deps.sh |  4 ++--
 lgsm/functions/fix_bo.sh     |  4 ++--
 lgsm/functions/fix_wurm.sh   | 13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 3e3990a44..18548e156 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -405,7 +405,7 @@ fn_deps_build_debian(){
 	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
 		array_deps_required+=( lib32z1 )
 	# Minecraft, Rising World, Wurm
-	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "rw" ]||[ "${shortname}" == "wurm" ]; then
+	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "rw" ]; then
 		javaversion=$(java -version 2>&1 | grep "version")
 		if [ "${javaversion}" ]; then
 			# Added for users using Oracle JRE to bypass the check.
@@ -514,7 +514,7 @@ fn_deps_build_redhat(){
 	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
 		array_deps_required+=( zlib-devel )
 	# Minecraft, Rising World, Wurm
-	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "rw" ]||[ "${shortname}" == "wurm" ]; then
+	elif [ "${shortname}" == "mc" ]||[ "${shortname}" == "rw" ]; then
 		javaversion=$(java -version 2>&1 | grep "version")
 		if [ "${javaversion}" ]; then
 			# Added for users using Oracle JRE to bypass the check.
diff --git a/lgsm/functions/fix_bo.sh b/lgsm/functions/fix_bo.sh
index 23c9179a2..13071036e 100644
--- a/lgsm/functions/fix_bo.sh
+++ b/lgsm/functions/fix_bo.sh
@@ -8,7 +8,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${serverfiles}:${serverfiles}/BODS_Data/Plugins/x86_64"
 
-# steamclient.so x86 fix for unity3d game server
+# steamclient.so x86 fix.
 if [ ! -f "${serverfiles}/BODS_Data/Plugins/x86/steamclient.so" ]; then
 	fixname="steamclient.so x86"
 	fn_fix_msg_start
@@ -21,7 +21,7 @@ if [ ! -f "${serverfiles}/BODS_Data/Plugins/x86/steamclient.so" ]; then
 	fn_fix_msg_end
 fi
 
-# steamclient.so x86_64 fix for unity3d game server
+# steamclient.so x86_64 fix.
 if [ ! -f "${serverfiles}/BODS_Data/Plugins/x86_64/steamclient.so" ]; then
 	fixname="steamclient.so x86_64"
 	fn_fix_msg_start
diff --git a/lgsm/functions/fix_wurm.sh b/lgsm/functions/fix_wurm.sh
index d43373cfe..713b32853 100644
--- a/lgsm/functions/fix_wurm.sh
+++ b/lgsm/functions/fix_wurm.sh
@@ -6,14 +6,15 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-if [ ! -f "${serverfiles}/nativelibs" ]; then
-	fixname="steamclient.so x86"
+# steamclient.so x86_64 fix.
+if [ ! -f "${serverfiles}/nativelibs/steamclient.so" ]; then
+	fixname="steamclient.so x86_64"
 	fn_fix_msg_start
 	mkdir -p "${serverfiles}/nativelibs"
-	if [ -f "${HOME}/.steam/steamcmd/linux32/steamclient.so" ]; then
-		cp "${HOME}/.steam/steamcmd/linux32/steamclient.so" "${serverfiles}/nativelibs/steamclient.so"
-	elif [ -f "${steamcmddir}/linux32/steamclient.so" ]; then
-		cp "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/nativelibs/steamclient.so"
+	if [ -f "${HOME}/.steam/steamcmd/linux64/steamclient.so" ]; then
+		cp "${HOME}/.steam/steamcmd/linux64/steamclient.so" "${serverfiles}/nativelibs/steamclient.so"
+	elif [ -f "${steamcmddir}/linux64/steamclient.so" ]; then
+		cp "${steamcmddir}/linux64/steamclient.so" "${serverfiles}/nativelibs/steamclient.so"
 	fi
 	fn_fix_msg_end
 fi