Просмотр исходного кода

Updated the Natural Selection 2 default config to support the new 64bit server binaries. 32bit support has been dropped.
Also updated the dependency and glibc checks to support the 64bit version of spark properly.
Note that ns2:combat continues to use a old 32bit fork of spark.

Sebastian Schuck 8 лет назад
Родитель
Сommit
3abb4d4549

+ 2 - 2
lgsm/config-default/config-lgsm/ns2server/_default.cfg

@@ -109,8 +109,8 @@ engine="spark"
 
 
 ## Server Specific Directories
 ## Server Specific Directories
 systemdir="${serverfiles}"
 systemdir="${serverfiles}"
-executabledir="${serverfiles}"
-executable="./server_linux32"
+executabledir="${serverfiles}/x64"
+executable="./server_linux"
 servercfgdir="${rootdir}/server1"
 servercfgdir="${rootdir}/server1"
 servercfgfullpath="${servercfgdir}"
 servercfgfullpath="${servercfgdir}"
 modstoragedir="${servercfgdir}/Workshop"
 modstoragedir="${servercfgdir}/Workshop"

+ 12 - 6
lgsm/functions/check_deps.sh

@@ -167,11 +167,14 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then
 
 
 	# Game Specific requirements
 	# Game Specific requirements
 
 
-	# Spark
-	if [ "${engine}" ==  "spark" ]; then
+	# Natural Selection 2
+	if [ "${gamename}" == "Natural Selection 2" ]; then
+		array_deps_required+=( speex libtbb2 )
+	# NS2: Combat
+	elif [ "${gamename}" == "NS2: Combat" ]; then
 		array_deps_required+=( speex:i386 libtbb2 )
 		array_deps_required+=( speex:i386 libtbb2 )
 	# 7 Days to Die
 	# 7 Days to Die
-	elif [ "${gamename}" ==  "7 Days To Die" ]; then
+	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
 	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
 	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
@@ -255,11 +258,14 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 
 
 	# Game Specific requirements
 	# Game Specific requirements
 
 
-	# Spark
-	if [ "${engine}" ==  "spark" ]; then
+	# Natural Selection 2
+	if [ "${gamename}" == "Natural Selection 2" ]; then
+		array_deps_required+=( speex libtbb2 )
+	# NS2: Combat
+	elif [ "${gamename}" == "NS2: Combat" ]; then
 		array_deps_required+=( speex.i686 tbb.i686 )
 		array_deps_required+=( speex.i686 tbb.i686 )
 	# 7 Days to Die
 	# 7 Days to Die
-	elif [ "${gamename}" ==  "7 Days To Die" ]; then
+	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
 	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
 	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then

+ 4 - 1
lgsm/functions/info_glibc.sh

@@ -131,7 +131,10 @@ elif [ "${engine}" == "source" ]; then
 elif [ "${engine}" == "goldsource" ]; then
 elif [ "${engine}" == "goldsource" ]; then
 	glibcrequired="2.3.4"
 	glibcrequired="2.3.4"
 	glibcfix="no"
 	glibcfix="no"
-elif [ "${engine}" == "spark" ]; then
+elif [ "${gamename}" == "Natural Selection 2" ]; then
+	glibcrequired="2.17"
+	glibcfix="yes"
+elif [ "${gamename}" == "NS2: Combat" ]; then
 	glibcrequired="2.15"
 	glibcrequired="2.15"
 	glibcfix="yes"
 	glibcfix="yes"
 elif [ "${engine}" == "starbound" ]; then
 elif [ "${engine}" == "starbound" ]; then