Merge pull request #1043 from GameServerManagers/gesserver

gesserver

GoldenEyeSource/gesserver

@@ -12,7 +12,6 @@ fi
 version="210516"
 
 #### Variables ####
-export MALLOC_CHECK_=0
 
 # Notification Alerts
 # (on|off)

lgsm/functions/check_deps.sh

@@ -245,7 +245,7 @@ elif [ -n "$(command -v yum)" ]; then
 		array_deps_required+=( java-1.8.0-openjdk )
 	# GoldenEye: Source
 	elif [ "${gamename}" ==  "GoldenEye: Source" ]; then
-		array_deps_required+=( zlib )
+		array_deps_required+=( zlib.i686 )
 	# Unreal Engine
 	elif [ "${executable}" ==  "./ucc-bin" ]; then
 		#UT2K4

lgsm/functions/check_glibc.sh

@@ -36,6 +36,6 @@ elif [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n
 		echo -e "	* glibc installed: ${red}${glibcversion}${default}"
 		echo -en "\n"
 		fn_print_information "The game server will probably not work. A distro upgrade is required!"
-		sleep 5
+		sleep 2
 	fi
 fi

lgsm/functions/core_functions.sh

@@ -292,6 +292,11 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
+fix_ges.sh(){
+functionfile="${FUNCNAME}"
+fn_fetch_function
+}
+
 fix_ins.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function

lgsm/functions/fix.sh

@@ -35,14 +35,16 @@ if [ "${function_selfname}" != "command_install.sh" ]; then
 		fix_steamcmd.sh
 	fi
 
-	if [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
+	if  [ "${gamename}" == "ARMA 3" ]; then
+		fix_arma3.sh
+	elif [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
 		fix_csgo.sh
 	elif [ "${gamename}" == "Don't Starve Together" ]; then
 		fix_dst.sh
+	elif [ "${gamename}" == "GoldenEye: Source" ]; then
+		fix_ges.sh
 	elif [ "${gamename}" == "Insurgency" ]; then
 		fix_ins.sh
-	elif [ "${gamename}" == "ARMA 3" ]; then
-		fix_arma3.sh
 	fi
 fi
 

lgsm/functions/fix_ges.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# LGSM fix_ges.sh function
+# Author: Daniel Gibbs
+# Website: https://gameservermanagers.com
+# Description: Resolves various issues with GoldenEye: Source.
+
+local commandname="FIX"
+local commandaction="Fix"
+
+# Fixes: MALLOC_CHECK_ needing to be set to 0.
+export MALLOC_CHECK_=0

lgsm/functions/fix_glibc.sh

@@ -8,7 +8,7 @@ local commandname="FIX"
 local commandaction="Fix"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
-local libstdc_servers_array=( "ARMA 3" "Blade Symphony" "Garry's Mod" "Just Cause 2" )
+local libstdc_servers_array=( "ARMA 3" "Blade Symphony" "Garry's Mod" "GoldenEye: Source" "Just Cause 2" )
 for libstdc_server in "${libstdc_servers_array[@]}"
 do
 	if [ "${gamename}" == "${libstdc_server}" ]; then
@@ -16,7 +16,7 @@ do
 	fi
 done
 
-local libm_servers_array=( "Codename CURE" "Day of Infamy" "Double Action: Boogaloo" "Empires Mod" "Fistful of Frags" "Garry's Mod" "Insurgency" "Natural Selection 2" "NS2: Combat" "No More Room in Hell" )
+local libm_servers_array=( "Codename CURE" "Day of Infamy" "Double Action: Boogaloo" "Empires Mod" "Fistful of Frags" "Garry's Mod" "GoldenEye: Source" "Insurgency" "Natural Selection 2" "NS2: Combat" "No More Room in Hell" )
 for libm_server in "${libm_servers_array[@]}"
 do
 	if [ "${gamename}" == "${libm_server}" ]; then
@@ -24,7 +24,7 @@ do
 	fi
 done
 
-local libc_servers_array=( "Garry's Mod" )
+local libc_servers_array=( "Garry's Mod" "GoldenEye: Source" )
 for libc_server in "${libc_servers_array[@]}"
 do
 	if [ "${gamename}" == "${libc_server}" ]; then

lgsm/functions/info_glibc.sh

@@ -26,6 +26,9 @@ elif [ "${gamename}" == "Fistful of Frags" ]; then
 elif [ "${gamename}" == "Garry's Mod" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"
+elif [ "${gamename}" == "GoldenEye: Source" ]; then
+	glibcrequired="2.15"
+	glibcfix="yes"
 elif [ "${gamename}" == "Insurgency" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"

lgsm/functions/install_server_files.sh

@@ -101,6 +101,10 @@ echo "Installing ${gamename} Server"
 echo "================================="
 sleep 1
 
+if [ -n "${appid}" ]; then
+	fn_install_server_files_steamcmd
+fi
+
 if [ "${gamename}" == "TeamSpeak 3" ]; then
 	update_ts3.sh
 elif [ "${gamename}" == "Minecraft" ]; then
@@ -112,10 +116,6 @@ elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]; then
 	fn_install_server_files
 fi
 
-if [ -n "${appid}" ]; then
-	fn_install_server_files_steamcmd
-fi
-
 if [ -z "${autoinstall}" ]; then
 	echo ""
 	echo "================================="