Sfoglia il codice sorgente

fix(wurm): fix server startup for wurm and dependency (#3046)

Christian 5 anni fa
parent
commit
7fe992920c
3 ha cambiato i file con 11 aggiunte e 10 eliminazioni
  1. 2 2
      lgsm/functions/check_deps.sh
  2. 2 2
      lgsm/functions/fix_bo.sh
  3. 7 6
      lgsm/functions/fix_wurm.sh

+ 2 - 2
lgsm/functions/check_deps.sh

@@ -405,7 +405,7 @@ fn_deps_build_debian(){
 	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
 	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
 		array_deps_required+=( lib32z1 )
 		array_deps_required+=( lib32z1 )
 	# Minecraft, Rising World, Wurm
 	# 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")
 		javaversion=$(java -version 2>&1 | grep "version")
 		if [ "${javaversion}" ]; then
 		if [ "${javaversion}" ]; then
 			# Added for users using Oracle JRE to bypass the check.
 			# Added for users using Oracle JRE to bypass the check.
@@ -514,7 +514,7 @@ fn_deps_build_redhat(){
 	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
 	elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then
 		array_deps_required+=( zlib-devel )
 		array_deps_required+=( zlib-devel )
 	# Minecraft, Rising World, Wurm
 	# 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")
 		javaversion=$(java -version 2>&1 | grep "version")
 		if [ "${javaversion}" ]; then
 		if [ "${javaversion}" ]; then
 			# Added for users using Oracle JRE to bypass the check.
 			# Added for users using Oracle JRE to bypass the check.

+ 2 - 2
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"
 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
 if [ ! -f "${serverfiles}/BODS_Data/Plugins/x86/steamclient.so" ]; then
 	fixname="steamclient.so x86"
 	fixname="steamclient.so x86"
 	fn_fix_msg_start
 	fn_fix_msg_start
@@ -21,7 +21,7 @@ if [ ! -f "${serverfiles}/BODS_Data/Plugins/x86/steamclient.so" ]; then
 	fn_fix_msg_end
 	fn_fix_msg_end
 fi
 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
 if [ ! -f "${serverfiles}/BODS_Data/Plugins/x86_64/steamclient.so" ]; then
 	fixname="steamclient.so x86_64"
 	fixname="steamclient.so x86_64"
 	fn_fix_msg_start
 	fn_fix_msg_start

+ 7 - 6
lgsm/functions/fix_wurm.sh

@@ -6,14 +6,15 @@
 
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 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
 	fn_fix_msg_start
 	mkdir -p "${serverfiles}/nativelibs"
 	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
 	fi
 	fn_fix_msg_end
 	fn_fix_msg_end
 fi
 fi