Merge remote-tracking branch 'refs/remotes/origin/master' into development

GoldenEyeSource/cfg/lgsm-default.cfg

@@ -46,6 +46,12 @@ mp_flashlight 0
 // 1 enables falling damage, 0 disables it
 mp_falldamage 1
 
+// Map/match time, in minutes
+mp_timelimit 15
+
+// Round time, in seconds
+ge_roundtime 300
+
 // 1 = Forces the engine to use light physics for  better server preformance
 sv_turbophysics 0
 
@@ -89,35 +95,8 @@ exec server_normal.cfg
 //   **Should be used ALONE only!
 //exec server_tournament.cfg
 
-
-// *********** Rates ***********
-
-// Max bandwidth rate allowed on server, 0=unlimited, max=20000
-sv_maxrate 20000
-
-// Min bandwidth rate allowed on server, 0=unlimited, 4000=dialup limit
-
-// 10000=any modern connection, CAL minimum rate.
-sv_minrate 10000
-
-// Maximum updates per second that the server will allow, increasing this will take more cpu power, 100 is max
-
-// 66 max, 50 min rate clamping reduces hit-reg problems.
-
-// Permitting lower rates only can help dialup players and not by much.
-sv_maxcmdrate 66
-sv_maxupdaterate 66
-sv_mincmdrate 50
-sv_minupdaterate 50
-
-// Enforce symmetrical rates.
-sv_client_cmdrate_difference 17
-
-// Ensure client interpolation functions appropriately.
-
-// Improves hit registration for bullet weapons.
-sv_client_max_interp_ratio 3
-sv_client_min_interp_ratio 2
+// Load network settings
+exec server_netvalues
 
 // *********** server logging ***********
 log on
@@ -144,7 +123,4 @@ sv_voiceenable 1
 sv_cheats 0
 
 // disable clients' ability to pause the server
-sv_pausable 0
-
-// Forces prediction on the client, protects clients from themselves.
-sv_client_predict 1
+sv_pausable 0

GoldenEyeSource/gesserver

@@ -12,7 +12,6 @@ fi
 version="210516"
 
 #### Variables ####
-export MALLOC_CHECK_=0
 
 # Notification Alerts
 # (on|off)
@@ -53,8 +52,8 @@ githubuser="GameServerManagers"
 githubrepo="LinuxGSM"
 githubbranch="master"
 
-# Steam - 2007 SDK
-appid="310"
+# Steam
+appid="310" # Source 2007 SDK
 
 # Server Details
 servicename="ges-server"

lgsm/functions/check_deps.sh

@@ -182,6 +182,9 @@ if [ -n "$(command -v dpkg-query)" ]; then
 	# Project Zomboid and Minecraft
 	elif [ "${engine}" ==  "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then
 		array_deps_required+=( default-jdk )
+	# GoldenEye: Source
+	elif [ "${gamename}" ==  "GoldenEye: Source" ]; then
+		array_deps_required+=( zlib1g:i386 )
 	# Unreal Engine
 	elif [ "${executable}" ==  "./ucc-bin" ]; then
 		#UT2K4
@@ -240,6 +243,9 @@ elif [ -n "$(command -v yum)" ]; then
 	# Project Zomboid and Minecraft
 	elif [ "${engine}" ==  "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then
 		array_deps_required+=( java-1.8.0-openjdk )
+	# GoldenEye: Source
+	elif [ "${gamename}" ==  "GoldenEye: Source" ]; then
+		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

@@ -10,19 +10,19 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 fn_install_server_files(){
 	if [ "${gamename}" == "Unreal Tournament 99" ]; then
-		fileurl="https://files.gameservermanagers.com/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut99-server-451-ultimate-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd"
+		fileurl="http://files.gameservermanagers.com/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut99-server-451-ultimate-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd"
 	elif [ "${gamename}" == "Unreal Tournament 2004" ]; then
-		fileurl="https://files.gameservermanagers.com/UnrealTournament2004/ut2004-server-3339-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut2004-server-3339-ultimate-linux.tar.bz2";  executecmd="noexecute" run="norun"; force="noforce"; md5="67c5e2cd9c2a4b04f163962ee41eff54"
+		fileurl="http://files.gameservermanagers.com/UnrealTournament2004/ut2004-server-3339-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut2004-server-3339-ultimate-linux.tar.bz2";  executecmd="noexecute" run="norun"; force="noforce"; md5="67c5e2cd9c2a4b04f163962ee41eff54"
 	elif [ "${gamename}" == "Unreal Tournament 3" ]; then
-		fileurl="https://files.gameservermanagers.com/UnrealTournament3/UT3-linux-server-2.1.tar.gz"; filedir="${lgsmdir}/tmp"; filename="UT3-linux-server-2.1.tar.gz";  executecmd="noexecute" run="norun"; force="noforce"; md5="6c22fcef9e2e03ed154df97569af540c"
+		fileurl="http://files.gameservermanagers.com/UnrealTournament3/UT3-linux-server-2.1.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="UT3-linux-server-2.1.tar.bz2";  executecmd="noexecute" run="norun"; force="noforce"; md5="6c22fcef9e2e03ed154df97569af540c"
 	elif [ "${gamename}" == "Battlefield: 1942" ]; then
-		fileurl="https://files.gameservermanagers.com/BattleField1942/bf1942_lnxded-1.61-hacked-to-1.612.full.tar.gz"; filedir="${lgsmdir}/tmp"; filename="bf1942_lnxded-1.61-hacked-to-1.612.full.tar.gz";  executecmd="noexecute" run="norun"; force="noforce"; md5="7e9d2538a62b228f2de7176b44659aa9"
+		fileurl="http://files.gameservermanagers.com/BattleField1942/bf1942_lnxded-1.61-hacked-to-1.612.full.tar.gz"; filedir="${lgsmdir}/tmp"; filename="bf1942_lnxded-1.61-hacked-to-1.612.full.tar.gz";  executecmd="noexecute" run="norun"; force="noforce"; md5="7e9d2538a62b228f2de7176b44659aa9"
 	elif [ "${gamename}" == "Enemy Territory" ]; then
-		fileurl="https://files.gameservermanagers.com/WolfensteinEnemyTerritory/enemy-territory.260b.tar.gz"; filedir="${lgsmdir}/tmp"; filename="enemy-territory.260b.tar.gz";  executecmd="noexecute" run="norun"; force="noforce"; md5="ded32053e470fe15d9403ec4a0ab7e89"
+		fileurl="http://files.gameservermanagers.com/WolfensteinEnemyTerritory/enemy-territory.260b.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="enemy-territory.260b.tar.gz";  executecmd="noexecute" run="norun"; force="noforce"; md5="ded32053e470fe15d9403ec4a0ab7e89"
 	elif [ "${gamename}" == "Unreal Tournament" ]; then
-		fileurl="https://files.gameservermanagers.com/UnrealTournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${lgsmdir}/tmp"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip";  executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6"
+		fileurl="http://files.gameservermanagers.com/UnrealTournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${lgsmdir}/tmp"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip";  executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6"
 	elif [ "${gamename}" == "GoldenEye: Source" ]; then
-		fileurl="https://files.gameservermanagers.com/GoldenEyeSource/goldenEye_source_v4.2.4_server_2015_map_pack.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="goldenEye_source_v4.2.4_server_2015_map_pack.tar.bz2";  executecmd="noexecute" run="norun"; force="noforce"; md5="3148ac38acc3642b0d6d64f51f27de15"
+		fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2";  executecmd="noexecute" run="norun"; force="noforce"; md5="976cebc812cd8af01c272e97835e77ce"
 	fi
 	fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}"
 	fn_dl_extract "${filedir}" "${filename}" "${filesdir}"
@@ -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 "================================="