From a37ebf57d4478693b2cb79c6c1507a562dd87184 Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Mon, 29 Aug 2016 00:14:22 -0400 Subject: [PATCH 01/18] GoldenEye: Source updates --- GoldenEyeSource/cfg/lgsm-default.cfg | 42 ++++++-------------------- lgsm/functions/install_server_files.sh | 2 +- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/GoldenEyeSource/cfg/lgsm-default.cfg b/GoldenEyeSource/cfg/lgsm-default.cfg index ae3f1319f..db1a2fdd6 100644 --- a/GoldenEyeSource/cfg/lgsm-default.cfg +++ b/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 \ No newline at end of file diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index fda796674..e69a4de76 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -22,7 +22,7 @@ fn_install_server_files(){ 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" 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="https://s3.amazonaws.com/linuxgsm/GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; executecmd="noexecute" run="norun"; force="noforce"; md5="5cee463370b9b776b3699f6be1826159" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From f303496733891600879445ef679a5fb89a9107c8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 12:58:33 +0100 Subject: [PATCH 02/18] Changed dl location for GoldenEye Source --- lgsm/functions/install_server_files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index e69a4de76..13e1f49f6 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -22,7 +22,7 @@ fn_install_server_files(){ 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" elif [ "${gamename}" == "GoldenEye: Source" ]; then - fileurl="https://s3.amazonaws.com/linuxgsm/GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; executecmd="noexecute" run="norun"; force="noforce"; md5="5cee463370b9b776b3699f6be1826159" + fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; executecmd="noexecute" run="norun"; force="noforce"; md5="5cee463370b9b776b3699f6be1826159" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From d8dc17e0e19a63cfe3a9b30f228699076c5907a7 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 14:01:33 +0100 Subject: [PATCH 03/18] convereted to bz2 from gz compressed by 200MB --- lgsm/functions/install_server_files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 13e1f49f6..9d5d3486f 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -22,7 +22,7 @@ fn_install_server_files(){ 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" elif [ "${gamename}" == "GoldenEye: Source" ]; then - fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.gz"; executecmd="noexecute" run="norun"; force="noforce"; md5="5cee463370b9b776b3699f6be1826159" + fileurl="https://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.gz"; executecmd="noexecute" run="norun"; force="noforce"; md5="5cee463370b9b776b3699f6be1826159" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From 9c45a75548b43461eb08ac7c37eb663946cf4841 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 14:02:14 +0100 Subject: [PATCH 04/18] converted to bz2 from gz --- lgsm/functions/install_server_files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 9d5d3486f..0f70a1355 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -18,7 +18,7 @@ fn_install_server_files(){ 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" 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="https://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" elif [ "${gamename}" == "GoldenEye: Source" ]; then From 49efc4280445b3d48fa0c32be793cfde68a6e4e1 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 14:21:32 +0100 Subject: [PATCH 05/18] Corrected file names --- GoldenEyeSource/gesserver | 5 ++--- lgsm/functions/install_server_files.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index deefdbb9c..af53e6bdf 100644 --- a/GoldenEyeSource/gesserver +++ b/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" diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 0f70a1355..1ea588368 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -14,7 +14,7 @@ fn_install_server_files(){ 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" 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="https://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" elif [ "${gamename}" == "Enemy Territory" ]; then @@ -22,7 +22,7 @@ fn_install_server_files(){ 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" elif [ "${gamename}" == "GoldenEye: Source" ]; then - fileurl="https://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.gz"; executecmd="noexecute" run="norun"; force="noforce"; md5="5cee463370b9b776b3699f6be1826159" + fileurl="https://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="5cee463370b9b776b3699f6be1826159" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From e2ca8841d3ad5653a360da736eac9a4a2a1da5da Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 14:38:32 +0100 Subject: [PATCH 06/18] updated GE:S MD5 --- lgsm/functions/install_server_files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 1ea588368..a752b8457 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -22,7 +22,7 @@ fn_install_server_files(){ 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" elif [ "${gamename}" == "GoldenEye: Source" ]; then - fileurl="https://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="5cee463370b9b776b3699f6be1826159" + fileurl="https://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}" From bf3b6bd78e17110b3a8c043eecfd8b32b6f0f732 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 16:34:00 +0100 Subject: [PATCH 07/18] changed to http from https --- lgsm/functions/install_server_files.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index a752b8457..f8f28ab69 100644 --- a/lgsm/functions/install_server_files.sh +++ b/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.bz2"; filedir="${lgsmdir}/tmp"; filename="UT3-linux-server-2.1.tar.bz2"; 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.bz2"; 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_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" + 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}" From 826853a656b3257020ad90fe9c4e760b8f9cec3e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 20:08:55 +0100 Subject: [PATCH 08/18] re-added export MALLOC_CHECK_=0 This will become a fix when ready --- GoldenEyeSource/gesserver | 1 + 1 file changed, 1 insertion(+) diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index af53e6bdf..b5de665da 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -12,6 +12,7 @@ fi version="210516" #### Variables #### +export MALLOC_CHECK_=0 # Notification Alerts # (on|off) From d43ce65ff98e18d5700585bc81df254400a545d3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 22:32:49 +0100 Subject: [PATCH 09/18] added requirements for GE:S --- lgsm/functions/check_deps.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 7c5cb0d50..e90c7430f 100644 --- a/lgsm/functions/check_deps.sh +++ b/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 ) # 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 ) # Unreal Engine elif [ "${executable}" == "./ucc-bin" ]; then #UT2K4 From 8a10fbc222c8a3b3be6a1075dc5c9beeac91a82b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 22:59:50 +0100 Subject: [PATCH 10/18] now zlib1g:i386 --- lgsm/functions/check_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index e90c7430f..e0af51ae1 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -184,7 +184,7 @@ if [ -n "$(command -v dpkg-query)" ]; then array_deps_required+=( default-jdk ) # GoldenEye: Source elif [ "${gamename}" == "GoldenEye: Source" ]; then - array_deps_required+=( zlib1g ) + array_deps_required+=( zlib1g:i386 ) # Unreal Engine elif [ "${executable}" == "./ucc-bin" ]; then #UT2K4 From 5b8d16b2faaf0c53bde1c43281ee2b48e54e6aae Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:14:28 +0100 Subject: [PATCH 11/18] added GE:S fix --- GoldenEyeSource/gesserver | 1 - lgsm/functions/fix.sh | 8 +++++--- lgsm/functions/fix_ges.sh | 11 +++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 lgsm/functions/fix_ges.sh diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index b5de665da..af53e6bdf 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -12,7 +12,6 @@ fi version="210516" #### Variables #### -export MALLOC_CHECK_=0 # Notification Alerts # (on|off) diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index 0178b363c..4374027eb 100644 --- a/lgsm/functions/fix.sh +++ b/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 diff --git a/lgsm/functions/fix_ges.sh b/lgsm/functions/fix_ges.sh new file mode 100644 index 000000000..c8ee7ad5d --- /dev/null +++ b/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 \ No newline at end of file From 55b1a3e665f7993b1ce6196fc8bc4dab270b9d0e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:16:08 +0100 Subject: [PATCH 12/18] added fix_ges.sh --- lgsm/functions/core_functions.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index 73f8bd44d..bef65153e 100644 --- a/lgsm/functions/core_functions.sh +++ b/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 From bd1b58893d9e225076d618975f0e72000c9b703a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:22:31 +0100 Subject: [PATCH 13/18] zlib.i686 --- lgsm/functions/check_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index e0af51ae1..46513f328 100644 --- a/lgsm/functions/check_deps.sh +++ b/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 From 24a6670d6af73cc7744785dbf318cc86923508b2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:24:34 +0100 Subject: [PATCH 14/18] Adding glibc fix for ge:s --- lgsm/functions/fix_glibc.sh | 2 +- lgsm/functions/info_glibc.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh index 5abe1ea28..d51d82402 100644 --- a/lgsm/functions/fix_glibc.sh +++ b/lgsm/functions/fix_glibc.sh @@ -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 diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index dea585ce9..40ed32cde 100644 --- a/lgsm/functions/info_glibc.sh +++ b/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" From c0ae13543a5fad9a899a19a225e25a5f789c7606 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:25:52 +0100 Subject: [PATCH 15/18] glibc fix ge:s --- lgsm/functions/fix_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh index d51d82402..92d9dbba7 100644 --- a/lgsm/functions/fix_glibc.sh +++ b/lgsm/functions/fix_glibc.sh @@ -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 From 78a846a5d0e36748d91290d7d463b0939aae46de Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:27:31 +0100 Subject: [PATCH 16/18] glibc fix ge:s --- lgsm/functions/fix_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh index 92d9dbba7..76856f648 100644 --- a/lgsm/functions/fix_glibc.sh +++ b/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 From cd284706f7cba7d0aa98be95544d9793d31865e3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:31:07 +0100 Subject: [PATCH 17/18] reduced to 2 seconds --- lgsm/functions/check_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_glibc.sh b/lgsm/functions/check_glibc.sh index 85caf6d01..a5e5c95a0 100644 --- a/lgsm/functions/check_glibc.sh +++ b/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 \ No newline at end of file From 681f1bbe1a0a492512201882e91a7bfebaa56dbf Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 29 Aug 2016 23:56:47 +0100 Subject: [PATCH 18/18] will install steamcmd files first --- lgsm/functions/install_server_files.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index f8f28ab69..4c5f33f0d 100644 --- a/lgsm/functions/install_server_files.sh +++ b/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 "================================="