Merge pull request #1735 from GhoulofGSG9/feature/ns2_server_64_bit

Update to support the 64bit binaries of Natural Selection 2

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

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

lgsm/functions/check_deps.sh

@@ -167,11 +167,14 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then
 
 	# Game Specific requirements
 
-	# Spark
+	# Natural Selection 2
-	if [ "${engine}" ==  "spark" ]; then
+	if [ "${gamename}" == "Natural Selection 2" ]; then
+		array_deps_required+=( speex libtbb2 )
+	# NS2: Combat
+	elif [ "${gamename}" == "NS2: Combat" ]; then
 		array_deps_required+=( speex:i386 libtbb2 )
 	# 7 Days to Die
-	elif [ "${gamename}" ==  "7 Days To Die" ]; then
+	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# 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
@@ -261,11 +264,14 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 
 	# Game Specific requirements
 
-	# Spark
+	# Natural Selection 2
-	if [ "${engine}" ==  "spark" ]; then
+	if [ "${gamename}" == "Natural Selection 2" ]; then
+		array_deps_required+=( speex tbb )
+	# NS2: Combat
+	elif [ "${gamename}" == "NS2: Combat" ]; then
 		array_deps_required+=( speex.i686 tbb.i686 )
 	# 7 Days to Die
-	elif [ "${gamename}" ==  "7 Days To Die" ]; then
+	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# 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

lgsm/functions/info_glibc.sh

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