From e18c0d4489db0706f84c2b4ebed2620f83d2b99d Mon Sep 17 00:00:00 2001 From: Chaos Date: Thu, 5 Jan 2017 15:36:16 -0600 Subject: [PATCH 01/37] Add unzip to required dependencies for LGSM --- lgsm/functions/check_deps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 36e0a8f04..7d02097a4 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -147,7 +147,7 @@ if [ -n "$(command -v dpkg-query)" ]; then array_deps_missing=() # LGSM requirements - array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python bzip2 gzip ) + array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python bzip2 gzip unzip ) # All servers except ts3 require tmux if [ "${gamename}" != "TeamSpeak 3" ]; then @@ -224,9 +224,9 @@ elif [ -n "$(command -v yum)" ]; then # LGSM requirements if [ "${distroversion}" == "6" ]; then - array_deps_required=( curl wget util-linux-ng python file gzip bzip2 ) + array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip ) else - array_deps_required=( curl wget util-linux python file gzip bzip2 ) + array_deps_required=( curl wget util-linux python file gzip bzip2 unzip ) fi # All servers except ts3 require tmux From 189a1659fc1820a52774bac2d23c04b33060ccf0 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 14 Jan 2017 18:34:45 +0100 Subject: [PATCH 02/37] Fixes arma3 ports actually working with parms Fixes #1240 --- lgsm/functions/command_details.sh | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index 3af2b7ac7..f606b2f37 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -310,7 +310,7 @@ fn_details_ports(){ parmslocation="${red}UNKNOWN${default}" # engines/games that require editing in the config file - local ports_edit_array=( "avalanche" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "projectzomboid" "quake" "refractor" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) + local ports_edit_array=( "avalanche" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "projectzomboid" "quake" "refractor" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) for port_edit in "${ports_edit_array[@]}" do if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then @@ -318,7 +318,7 @@ fn_details_ports(){ fi done # engines/games that require editing in the script file - local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "Rust" "spark" "source" "starbound" "unreal4" ) + local ports_edit_array=( "goldsource" "Factorio" "Hurtworld" "iw3.0" "Rust" "spark" "source" "starbound" "unreal4" "realvirtuality") for port_edit in "${ports_edit_array[@]}" do if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then @@ -347,9 +347,14 @@ fn_details_ark(){ echo -e "netstat -atunp | grep ShooterGame" echo -e "" { - echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL\tINI VARIABLE" - echo -e "> Game\tINBOUND\t${port}\tudp\tPort=${port}" + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + # Don't do arithmetics if ever the port wasn't a numeric value + if [ "${port}" -eq "${port}" ]; then + echo -e "> RAW\tINBOUND\t$((port+1))\tudp" + fi echo -e "> Query\tINBOUND\t${queryport}\tudp" + echo -e "> RCON\tINBOUND\t${rconport}\ttcp" } | column -s $'\t' -t } @@ -521,15 +526,19 @@ fn_details_quakelive(){ fn_details_realvirtuality(){ echo -e "netstat -atunp | grep arma3server" echo -e "" - if [ -z "${port}" ]||[ -z "${queryport}" ]||[ -z "${masterport}" ]; then - echo -e "${red}ERROR!${default} Missing/commented ports in ${servercfg}." - echo -e "" + # Default port + if [ -z "${port}" ]; then + port="2302" fi { echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" echo -e "> Game\tINBOUND\t${port}\tudp" - echo -e "> Steam: Query\tINBOUND\t${queryport}\tudp" - echo -e "> Steam: Master traffic\tINBOUND\t${masterport}\tudp" + # Don't do arithmetics if ever the port wasn't a numeric value + if [ "${port}" -eq "${port}" ]; then + echo -e "> Steam: Query\tINBOUND\t$((port+1))\tudp" + echo -e "> Steam: Master traffic\tINBOUND\t$((port+2))\tudp" + echo -e "> Undocumented Port\tINBOUND\t$((port+3))\tudp" + fi } | column -s $'\t' -t } @@ -772,7 +781,7 @@ fn_display_details() { fn_details_ut3 elif [ "${gamename}" == "7 Days To Die" ]; then fn_details_sdtd - elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then + elif [ "${gamename}" == "ARK: Survival Evolved" ]; then fn_details_ark elif [ "${gamename}" == "Call of Duty" ]; then fn_details_cod @@ -816,4 +825,3 @@ then fn_display_details core_exit.sh fi - From c5535543e1106bc5b1680e02f04f357bf3870245 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 14 Jan 2017 18:36:12 +0100 Subject: [PATCH 03/37] Revert change to Ark to fit master, not develop --- lgsm/functions/command_details.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index f606b2f37..5f7f43b1e 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -781,7 +781,7 @@ fn_display_details() { fn_details_ut3 elif [ "${gamename}" == "7 Days To Die" ]; then fn_details_sdtd - elif [ "${gamename}" == "ARK: Survival Evolved" ]; then + elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then fn_details_ark elif [ "${gamename}" == "Call of Duty" ]; then fn_details_cod From aecdd4c3a36a17d08a9559f4e9d448b24a845ca5 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 19:32:49 -0600 Subject: [PATCH 04/37] Trying out a hypothesis on the travis failures. --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f91811da3..abb770e05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,16 @@ language: bash -sudo: false +sudo: required env: - DISTRO=ubuntu-trusty before_script: + - sudo ls -l /sys/class/net + - sudo ls -l --dereference /sys/class/net + - sudo ls -lad /sys/class + - sudo ls -lad /sys/devices + - sudo chmod a+x /sys + - sudo chmod a+rx /sys/class + - sudo chmod a+r /sys/class/net - curl -L "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz" | tar zx addons: From 896c1b8fa54d391e6e69147321af8bf165332d37 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 19:50:13 -0600 Subject: [PATCH 05/37] One successful travis build. Ref: #1186 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abb770e05..0b4a10ab8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ env: - DISTRO=ubuntu-trusty before_script: - - sudo ls -l /sys/class/net + - sudo ls -l /sys - sudo ls -l --dereference /sys/class/net - sudo ls -lad /sys/class - sudo ls -lad /sys/devices From 2c2ac53082696987a1171c3a73e19d51303fdcb6 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 19:58:07 -0600 Subject: [PATCH 06/37] #1186 revisited. --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b4a10ab8..b63d7cd85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,7 @@ env: - DISTRO=ubuntu-trusty before_script: - - sudo ls -l /sys - - sudo ls -l --dereference /sys/class/net - - sudo ls -lad /sys/class - - sudo ls -lad /sys/devices - - sudo chmod a+x /sys - - sudo chmod a+rx /sys/class - - sudo chmod a+r /sys/class/net + - sudo ls -ld /sys - curl -L "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz" | tar zx addons: From a1a68db23369bc6cd93c95d1b0e6092f3f58b676 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 20:01:42 -0600 Subject: [PATCH 07/37] #1186 - Making sudo required seems to resolve the issue. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b63d7cd85..d385c27fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ env: - DISTRO=ubuntu-trusty before_script: - - sudo ls -ld /sys - curl -L "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz" | tar zx addons: From 5fa0d131a00d741faa73be5bb52bcbeb79cc22ef Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 20:49:37 -0600 Subject: [PATCH 08/37] Trying to break it now. --- .travis.yml | 3 ++- tests/tests_jc2server.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d385c27fa..84fc85d9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: bash -sudo: required +sudo: false env: - DISTRO=ubuntu-trusty @@ -19,6 +19,7 @@ addons: - libstdc++6:i386 - telnet - expect + - strace script: diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index cd765b480..194165365 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -(command_start.sh) +(strace -f command_start.sh | tee /tmp/output; curl --upload-file ./hello.txt https://transfer.sh/hello.txt) fn_test_result_pass echo "" From 74cdfa3cff326f4a714bc8d11e2552b6eefad518 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 20:53:24 -0600 Subject: [PATCH 09/37] Meh. Cut-and-paste the wrong line. --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 194165365..44731f195 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -(strace -f command_start.sh | tee /tmp/output; curl --upload-file ./hello.txt https://transfer.sh/hello.txt) +(strace -f command_start.sh | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output) fn_test_result_pass echo "" From 663763e6a34d05daf6747a7770e3764600c2e1a8 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 20:57:23 -0600 Subject: [PATCH 10/37] Floundering a bit grok'ing travis. --- tests/tests_jc2server.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 44731f195..83133814a 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,8 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -(strace -f command_start.sh | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output) +strace -f (command_start.sh) | tee /tmp/output +curl --upload-file /tmp/output https://transfer.sh/output fn_test_result_pass echo "" From e83e9b62d2e8bdfa6781a3074cb579aad509289a Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:03:28 -0600 Subject: [PATCH 11/37] More playing with travis. --- tests/tests_jc2server.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 83133814a..06b44cc89 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,8 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f (command_start.sh) | tee /tmp/output -curl --upload-file /tmp/output https://transfer.sh/output +strace -f ~/jc2server start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output fn_test_result_pass echo "" From b0aa04f723d29c36a167d3e72387e6ca6a7354ea Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:06:54 -0600 Subject: [PATCH 12/37] IBID --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 06b44cc89..d06379bca 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f ~/jc2server start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output +strace -f ./tests-jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output fn_test_result_pass echo "" From c9a655c46cfc4d12b85d432f6993960cdaabdfb0 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:10:24 -0600 Subject: [PATCH 13/37] IBID --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index d06379bca..a6a340b7c 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f ./tests-jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output +strace -f tests/tests-jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output fn_test_result_pass echo "" From 83617a604ca4b7f7565fb413b2df985a06c55adc Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:17:11 -0600 Subject: [PATCH 14/37] ibid --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index a6a340b7c..ce48d5265 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f tests/tests-jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output +strace -f tests/tests_jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output fn_test_result_pass echo "" From 5649a226c8d27177637da67738b76f11a9b0cbfb Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:20:30 -0600 Subject: [PATCH 15/37] ibid --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index ce48d5265..b03542993 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f tests/tests_jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output +strace -f bash tests/tests_jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output fn_test_result_pass echo "" From ef4b57cbd0f140652bee744b14807f63f205a052 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:24:41 -0600 Subject: [PATCH 16/37] closer to a closer. --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index b03542993..0bee062e8 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f bash tests/tests_jc2server.sh start | tee /tmp/output; curl --upload-file /tmp/output https://transfer.sh/output +strace -f bash tests/tests_jc2server.sh start > /tmp/output 2>&1; curl --upload-file /tmp/output https://transfer.sh/output fn_test_result_pass echo "" From 9929c3ecbde9f8740a4dd7666047b9a202a358b1 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:29:35 -0600 Subject: [PATCH 17/37] back to square 1 --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 0bee062e8..cd765b480 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f bash tests/tests_jc2server.sh start > /tmp/output 2>&1; curl --upload-file /tmp/output https://transfer.sh/output +(command_start.sh) fn_test_result_pass echo "" From d1d47dd2e7f5c987cf644bdbd905900e4f506ecf Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:43:53 -0600 Subject: [PATCH 18/37] testing another aspect --- tests/tests_jc2server.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index cd765b480..657854d17 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,8 +358,10 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus +bash -x tests/tests_jc2server.sh start (command_start.sh) fn_test_result_pass +find . -name *.log echo "" echo "3.2 - start - online" From fe05fc466f7dbaf645bf488a4d5d8d0ed651fdc7 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 21:52:28 -0600 Subject: [PATCH 19/37] more tests. [is what bad students everywhere have never said, ever] --- tests/tests_jc2server.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 657854d17..05aae74d9 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,8 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -bash -x tests/tests_jc2server.sh start +bash -x tests/tests_jc2server.sh start > /tmp/output 2>&1 +curl --upload-file /tmp/output https://transfer.sh/lgsm (command_start.sh) fn_test_result_pass find . -name *.log From 7826ee237e55667fa01ce8474e0cc299d0a3d415 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:07:48 -0600 Subject: [PATCH 20/37] more tests --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 05aae74d9..3fdd87ad8 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -bash -x tests/tests_jc2server.sh start > /tmp/output 2>&1 +bash -x tests/tests_jc2server.sh start | tee /tmp/output 2>&1 curl --upload-file /tmp/output https://transfer.sh/lgsm (command_start.sh) fn_test_result_pass From d706670fd3bf3ff1700d7119196083c425be016e Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:13:30 -0600 Subject: [PATCH 21/37] more tests --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 3fdd87ad8..4a1681201 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -bash -x tests/tests_jc2server.sh start | tee /tmp/output 2>&1 +bash -x tests/jc2server start | tee /tmp/output 2>&1 curl --upload-file /tmp/output https://transfer.sh/lgsm (command_start.sh) fn_test_result_pass From 8a3411b51a3b30d9c9a4df4855ddedee6a9024c2 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:17:39 -0600 Subject: [PATCH 22/37] travis-ty --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 4a1681201..17653a658 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -359,10 +359,10 @@ echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus bash -x tests/jc2server start | tee /tmp/output 2>&1 +find . >> /tmp/output curl --upload-file /tmp/output https://transfer.sh/lgsm (command_start.sh) fn_test_result_pass -find . -name *.log echo "" echo "3.2 - start - online" From 52565e889024807a16121d22fe0be6657871a95a Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:23:26 -0600 Subject: [PATCH 23/37] travisty --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 17653a658..f0807f127 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -bash -x tests/jc2server start | tee /tmp/output 2>&1 +bash -x tests/lgsm/functions/command_start.sh | tee /tmp/output 2>&1 find . >> /tmp/output curl --upload-file /tmp/output https://transfer.sh/lgsm (command_start.sh) From 85fcb07ccd73bb83bfcc89a448d218d52cfed335 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:29:52 -0600 Subject: [PATCH 24/37] travista. --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index f0807f127..5eb26df9d 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,7 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -bash -x tests/lgsm/functions/command_start.sh | tee /tmp/output 2>&1 +strace -f tests/lgsm/functions/command_start.sh > tee /tmp/output 2>&1 find . >> /tmp/output curl --upload-file /tmp/output https://transfer.sh/lgsm (command_start.sh) From dd27330aebdadc407e5f974a1051f3e06fd3a249 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:36:34 -0600 Subject: [PATCH 25/37] tests --- tests/tests_jc2server.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 5eb26df9d..801d344b3 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,9 +358,11 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f tests/lgsm/functions/command_start.sh > tee /tmp/output 2>&1 +strace -f tests/lgsm/functions/command_start.sh > /tmp/output 2>&1 find . >> /tmp/output curl --upload-file /tmp/output https://transfer.sh/lgsm +curl --upload-file ./tests/log/script/*.log https://transfer.sh/slog +curl --upload-file ./tests/log/console/*.log https://transfer.sh/clog (command_start.sh) fn_test_result_pass From fdb46fafd17878fc916a59b6951ba6c32a896e10 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:38:07 -0600 Subject: [PATCH 26/37] Move the logs --- tests/tests_jc2server.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 801d344b3..5401dfa02 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,12 +358,9 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -strace -f tests/lgsm/functions/command_start.sh > /tmp/output 2>&1 -find . >> /tmp/output -curl --upload-file /tmp/output https://transfer.sh/lgsm +(command_start.sh) curl --upload-file ./tests/log/script/*.log https://transfer.sh/slog curl --upload-file ./tests/log/console/*.log https://transfer.sh/clog -(command_start.sh) fn_test_result_pass echo "" From 2abbd25bfb6da5b98001d96af102289fc37c9e8f Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:43:42 -0600 Subject: [PATCH 27/37] Path tweak --- tests/tests_jc2server.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 5401dfa02..4540e44a0 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,6 +358,7 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus +PATH=$PATH:./tests/lgsm/functions strace -f tests/lgsm/functions/command_start.sh > /tmp/output 2>&1 (command_start.sh) curl --upload-file ./tests/log/script/*.log https://transfer.sh/slog curl --upload-file ./tests/log/console/*.log https://transfer.sh/clog From 650f992b3edfdbe1413753ef77e5c4c5f14c7a64 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:49:25 -0600 Subject: [PATCH 28/37] nothing to see here. (so I added echo) --- tests/tests_jc2server.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 4540e44a0..93194587c 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,9 +358,11 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -PATH=$PATH:./tests/lgsm/functions strace -f tests/lgsm/functions/command_start.sh > /tmp/output 2>&1 +PATH=${PATH}:./tests/lgsm/functions strace -f tests/lgsm/functions/command_start.sh > /tmp/output 2>&1 (command_start.sh) +echo curl --upload-file ./tests/log/script/*.log https://transfer.sh/slog curl --upload-file ./tests/log/script/*.log https://transfer.sh/slog +echo curl --upload-file ./tests/log/console/*.log https://transfer.sh/clog curl --upload-file ./tests/log/console/*.log https://transfer.sh/clog fn_test_result_pass From 62d5b0833549f0088f3773467b0089ef04bc9ba3 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 22:54:15 -0600 Subject: [PATCH 29/37] curl it --- tests/tests_jc2server.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 93194587c..35f15bfc9 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -360,10 +360,10 @@ requiredstatus="OFFLINE" fn_setstatus PATH=${PATH}:./tests/lgsm/functions strace -f tests/lgsm/functions/command_start.sh > /tmp/output 2>&1 (command_start.sh) -echo curl --upload-file ./tests/log/script/*.log https://transfer.sh/slog -curl --upload-file ./tests/log/script/*.log https://transfer.sh/slog -echo curl --upload-file ./tests/log/console/*.log https://transfer.sh/clog -curl --upload-file ./tests/log/console/*.log https://transfer.sh/clog +for x in ./tests/log/*/*.log /tmp/output +do +curl --upload-file $x https://transfer.sh/lgsm +done fn_test_result_pass echo "" From 9c076536f349600cb2d81946cb46159e7da1c119 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 23:02:17 -0600 Subject: [PATCH 30/37] Packages #1 --- tests/tests_jc2server.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 35f15bfc9..ad54edebe 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,12 +358,9 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -PATH=${PATH}:./tests/lgsm/functions strace -f tests/lgsm/functions/command_start.sh > /tmp/output 2>&1 +dpkg -l > /tmp/packages +curl --upload-file ./tmp/packages https://transfer.sh/lgsm (command_start.sh) -for x in ./tests/log/*/*.log /tmp/output -do -curl --upload-file $x https://transfer.sh/lgsm -done fn_test_result_pass echo "" From 606570b11648d678c4dde6d134cd7ef781934e56 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 23:03:04 -0600 Subject: [PATCH 31/37] Packages 2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84fc85d9e..5ea64bd39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: bash -sudo: false +sudo: required env: - DISTRO=ubuntu-trusty From 47a6c84dbcaeb3f7ddcd86c6868fa502cc89caf2 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 23:05:01 -0600 Subject: [PATCH 32/37] Packages 1(b) --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index ad54edebe..48c9f09cd 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -359,7 +359,7 @@ echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus dpkg -l > /tmp/packages -curl --upload-file ./tmp/packages https://transfer.sh/lgsm +curl --upload-file /tmp/packages https://transfer.sh/lgsm (command_start.sh) fn_test_result_pass From cc7ddcac7f92ed945dfe060a17fb28ac38e1eb6e Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 23:05:22 -0600 Subject: [PATCH 33/37] Packages 1(a) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ea64bd39..84fc85d9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: bash -sudo: required +sudo: false env: - DISTRO=ubuntu-trusty From 58fa09aa1ccfb413a50631d5523f8016cf10b678 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sat, 14 Jan 2017 23:10:37 -0600 Subject: [PATCH 34/37] put sudo back in. check packages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84fc85d9e..5ea64bd39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: bash -sudo: false +sudo: required env: - DISTRO=ubuntu-trusty From 4804346806635d1aa8dd133fe14675ac0dd927b2 Mon Sep 17 00:00:00 2001 From: CedarLUG Date: Sun, 15 Jan 2017 08:56:40 -0600 Subject: [PATCH 35/37] This should roll everything back to a single one-line "sudo: required". --- .travis.yml | 1 - tests/tests_jc2server.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ea64bd39..d385c27fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ addons: - libstdc++6:i386 - telnet - expect - - strace script: diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 48c9f09cd..cd765b480 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -358,8 +358,6 @@ echo "start ${gamename} server." echo "Command: ./jc2server start" requiredstatus="OFFLINE" fn_setstatus -dpkg -l > /tmp/packages -curl --upload-file /tmp/packages https://transfer.sh/lgsm (command_start.sh) fn_test_result_pass From 37fae9b0875a865e712c427c6ae20702f9c6eff3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 15 Jan 2017 17:47:18 +0000 Subject: [PATCH 36/37] Fixed some insonsistancys with the comments --- 7DaysToDie/sdtdserver | 1 - ARKSurvivalEvolved/arkserver | 1 - Arma3/arma3server | 1 - Battlefield1942/bf1942server | 2 +- BlackMesa/bmdmserver | 1 - BladeSymphony/bsserver | 1 - BrainBread2/bb2server | 1 - CallOfDuty2/cod2server | 1 - CallOfDuty4/cod4server | 1 - CallOfDutyUnitedOffensive/coduoserver | 1 - CallOfDutyWorldAtWar/codwawserver | 1 - CodenameCURE/ccserver | 3 ++- CounterStrike/csserver | 1 - CounterStrikeConditionZero/csczserver | 1 - CounterStrikeGlobalOffensive/csgoserver | 1 - CounterStrikeSource/cssserver | 1 - DayOfDefeat/dodserver | 1 - DayOfDefeatSource/dodsserver | 1 - DayOfInfamy/doiserver | 1 - DeathmatchClassic/dmcserver | 1 - DoubleActionBoogaloo/dabserver | 1 - EmpiresMod/emserver | 1 - Factorio/fctrserver | 1 - FistfulOfFrags/fofserver | 1 - GarrysMod/gmodserver | 1 - GoldenEyeSource/gesserver | 3 +-- HalfLife2Deathmatch/hl2dmserver | 1 - HalfLifeDeathmatch/hldmserver | 1 - HalfLifeDeathmatchSource/hldmsserver | 1 - Insurgency/insserver | 1 - JustCause2/jc2server | 4 ---- KillingFloor/kfserver | 3 ++- Left4Dead/l4dserver | 1 - Left4Dead2/l4d2server | 1 - Minecraft/mcserver | 1 - Mumble/mumbleserver | 1 - NS2Combat/ns2cserver | 1 - NaturalSelection2/ns2server | 1 - NoMoreRoomInHell/nmrihserver | 1 - OpposingForce/opforserver | 1 - PiratesVikingandKnightsII/pvkiiserver | 1 - QuakeWorld/qwserver | 1 - RedOrchestra/roserver | 1 - Ricochet/ricochetserver | 4 +--- Rust/rustserver | 1 - Starbound/sbserver | 1 - SvenCoop/svenserver | 1 - TeamFortress2/tf2server | 1 - TeamFortressClassic/tfcserver | 1 - Teeworlds/twserver | 1 - Terraria/terrariaserver | 1 - UnrealTournament/utserver | 1 - UnrealTournament2004/ut2k4server | 1 - UnrealTournament99/ut99server | 1 - WolfensteinEnemyTerritory/wetserver | 4 ---- tests/tests_jc2server.sh | 1 - tests/tests_ts3server.sh | 1 + 57 files changed, 8 insertions(+), 65 deletions(-) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 36bfbed5d..6ca116aa7 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -30,7 +30,6 @@ steampass='password' ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | http://7daystodie.gamepedia.com/Server fn_parms(){ parms="-logfile ${gamelogdir}/output_log__`date +%Y-%m-%d__%H-%M-%S`.txt -quit -batchmode -nographics -dedicated -configfile=${servercfgfullpath}" } diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index 6bc5079c0..da408b353 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -30,7 +30,6 @@ maxplayers="70" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="\"TheIsland?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port}?\"" } diff --git a/Arma3/arma3server b/Arma3/arma3server index 8898beb93..8d6dcb210 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -46,7 +46,6 @@ servermods="" bepath="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="-netlog -ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory" } diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index 42d616617..51b8dfcc0 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -22,7 +22,7 @@ version="170110" #### Server Settings #### -## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ parms="+hostServer 1 +dedicated 1" } diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 18f0647bb..1b6c9d573 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -36,7 +36,6 @@ ip="0.0.0.0" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 0bac17035..38c71ce1e 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -35,7 +35,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-autoupdate -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 50e46bf72..df5034bb8 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -39,7 +39,6 @@ ip="0.0.0.0" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game brainbread2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/CallOfDuty2/cod2server b/CallOfDuty2/cod2server index ecf79db64..db4f07af9 100755 --- a/CallOfDuty2/cod2server +++ b/CallOfDuty2/cod2server @@ -23,7 +23,6 @@ version="170110" #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - defaultmap="mp_leningrad" maxclients="20" port="28960" diff --git a/CallOfDuty4/cod4server b/CallOfDuty4/cod4server index 8ccebd949..6b4a0260e 100644 --- a/CallOfDuty4/cod4server +++ b/CallOfDuty4/cod4server @@ -23,7 +23,6 @@ version="170110" #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - defaultmap="mp_crossfire" maxclients="32" port="28960" diff --git a/CallOfDutyUnitedOffensive/coduoserver b/CallOfDutyUnitedOffensive/coduoserver index 02f2b8b09..c3d71ae8a 100755 --- a/CallOfDutyUnitedOffensive/coduoserver +++ b/CallOfDutyUnitedOffensive/coduoserver @@ -23,7 +23,6 @@ version="170110" #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - defaultmap="mp_cassino" maxclients="20" port="28960" diff --git a/CallOfDutyWorldAtWar/codwawserver b/CallOfDutyWorldAtWar/codwawserver index 2f3e93fae..5e3681ead 100755 --- a/CallOfDutyWorldAtWar/codwawserver +++ b/CallOfDutyWorldAtWar/codwawserver @@ -23,7 +23,6 @@ version="170110" #### Server Settings #### ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters - defaultmap="mp_castle" maxclients="20" port="28960" diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index 08eb09a3d..3196b993c 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -20,6 +20,8 @@ version="170110" ######## Settings ######## ########################## +#### Server Settings #### + ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters defaultmap="cbe_bunker" maxplayers="6" @@ -29,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game cure -insecure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/CounterStrike/csserver b/CounterStrike/csserver index c23d9c988..4add519a6 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game cstrike -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 3e25bb09a..8333438b9 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game czero -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index de6450a99..8a306dc03 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -54,7 +54,6 @@ gslt="" # ws_start_map="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey}" } diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index dca4bfa8a..bdee401bb 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -37,7 +37,6 @@ updateonstart="off" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game cstrike -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index d9e1b19c4..efe5861f8 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -31,7 +31,6 @@ ip="0.0.0.0" updateonstart="off" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game dod -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 2e98b7771..3508e0686 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -31,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | ttps://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game dod -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index 215a1d8a4..5d2ed38fe 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -33,7 +33,6 @@ ip="0.0.0.0" workshop="0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game doi -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} +sv_workshop_enabled ${workshop}" } diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index a0e438363..4ef098e91 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game dmc -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index 821fbf872..245cd0c59 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -31,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index d64f0491a..36cb92f5a 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -36,7 +36,6 @@ ip="0.0.0.0" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game empires -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/Factorio/fctrserver b/Factorio/fctrserver index 0d10ee24d..8843668e4 100644 --- a/Factorio/fctrserver +++ b/Factorio/fctrserver @@ -29,7 +29,6 @@ rconpassword="CHANGE_ME" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="--start-server ${filesdir}/save1.zip --server-settings ${servercfgfullpath} --port ${port} --rcon-port ${rconport} --rcon-password ${rconpassword}" } diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 8cbda31ac..988a1b680 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -31,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game fof -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index a73ac81fa..c432c6769 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -46,7 +46,6 @@ customparms="+r_hunkalloclightmaps 0" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} +host_workshop_collection ${workshopcollectionid} -authkey ${workshopauth} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} ${customparms}" } diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index b5c7aa25b..d1520cc35 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -22,7 +22,7 @@ version="170110" #### Server Settings #### -# Start Variables +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters defaultmap="ge_archives" maxplayers="16" port="27015" @@ -31,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game gesource -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index bb4f2c73a..b5a15f78c 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -31,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game hl2mp -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index c2a95d39f..8ba1b8d01 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game valve -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 707881508..c25dc3fbf 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -31,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game hl1mp -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/Insurgency/insserver b/Insurgency/insserver index 722fcea46..eac3777c3 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -33,7 +33,6 @@ ip="0.0.0.0" workshop="0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game insurgency -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers} +sv_workshop_enabled ${workshop} -norestart" } diff --git a/JustCause2/jc2server b/JustCause2/jc2server index d36ef0a00..626df4b3a 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -20,11 +20,7 @@ version="170110" ######## Settings ######## ########################## -#### Server Settings #### -# No settings available for Just Cause 2 - ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="" } diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index e42dd92a1..baca47dcc 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -30,10 +30,11 @@ steampass='password' defaultmap="KF-BioticsLab.rom" ip="0.0.0.0" +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ parms="server ${defaultmap}?game=KFmod.KFGameType?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}" -# Start Variables for Objective mode +# Server Start Command for Objective mode #defaultmap="KFO-Steamland" #parms="server ${defaultmap}?Game=KFStoryGame.KFStoryGame?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}" } diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index a6446c8bf..2216a5f93 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game left4dead -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index 23902ea43..496444a20 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game left4dead2 -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/Minecraft/mcserver b/Minecraft/mcserver index 74e03c6ab..82999f5a3 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -26,7 +26,6 @@ version="170110" javaram="1024" # -Xmx$1024M ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="nogui" } diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index 4e4a28f4c..6dd9eb2d3 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -24,7 +24,6 @@ version="170110" # Use .ini config file for Mumble (Murmur) server. ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="-fg -ini ${servercfgfullpath}" } diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index b5fcd7b8f..c1b39d836 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -42,7 +42,6 @@ password="" # -password \"${password}\" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | http://wiki.unknownworlds.com/ns2/Dedicated_Server fn_parms(){ parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\"" } diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index c662ecbd5..bc01063c2 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -42,7 +42,6 @@ password="" # -password \"${password}\" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | http://wiki.unknownworlds.com/ns2/Dedicated_Server fn_parms(){ parms="-name \"${servername}\" -port ${port} -webadmin -webdomain ${ip} -webuser ${webadminuser} -webpassword \"${webadminpass}\" -webport ${webadminport} -map ${defaultmap} -limit ${maxplayers} -config_path \"${servercfgdir}\" -logdir \"${gamelogdir}\" -modstorage \"${modstoragedir}\" -mods \"${mods}\"" } diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index 54e59c299..5a925ea54 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -36,7 +36,6 @@ ip="0.0.0.0" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game nmrih -insecure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 5d347f06b..945f353d4 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game gearbox -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index 56ad17438..6a715b7b9 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -31,7 +31,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game pvkii -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/QuakeWorld/qwserver b/QuakeWorld/qwserver index 7e27f0a89..1b92190e3 100644 --- a/QuakeWorld/qwserver +++ b/QuakeWorld/qwserver @@ -27,7 +27,6 @@ port="27500" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-port ${port} -game ktx +exec ${servercfg}" } diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 8170bb53d..0812c7f41 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -31,7 +31,6 @@ defaultmap="RO-Arad.rom" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="server ${defaultmap}?game=ROGame.ROTeamGame?VACSecured=true -nohomedir ini=${servercfg} log=${gamelog}" } diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index d3165f2fd..16d9fca81 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -22,7 +22,7 @@ version="170110" #### Server Settings #### -# Start Variables +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters defaultmap="rc_arena" maxplayers="16" port="27015" @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game ricochet -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } @@ -50,7 +49,6 @@ ip="0.0.0.0" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="" } diff --git a/Rust/rustserver b/Rust/rustserver index 14d9e4e42..aa740f8b1 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -38,7 +38,6 @@ saveinterval="300" # Auto-save in seconds tickrate="30" # default 30; range : 15 to 100 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Rust_Dedicated_Server fn_parms(){ parms="-batchmode +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${servicename}\" ${conditionalseed} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile ${gamelogfile}" } diff --git a/Starbound/sbserver b/Starbound/sbserver index e6b37dc71..899d846dc 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -30,7 +30,6 @@ steampass='password' ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="" } diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index b2e7f35e8..10e27db1b 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game svencoop -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index a278d0921..bbc242d0b 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -36,7 +36,6 @@ ip="0.0.0.0" gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server fn_parms(){ parms="-game tf -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index beec9da19..6c3a7d9eb 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -30,7 +30,6 @@ clientport="27005" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2 fn_parms(){ parms="-game tfc -strictportbind _ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} -maxplayers ${maxplayers}" } diff --git a/Teeworlds/twserver b/Teeworlds/twserver index 4a9684003..d0de5a1d0 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -30,7 +30,6 @@ steampass='password' ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="-f ${servercfgfullpath}" } diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index a55c57286..a155828eb 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -30,7 +30,6 @@ steampass='password' ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="-config ${servercfgfullpath}" } diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index 49d955329..e95414adc 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -31,7 +31,6 @@ ip="0.0.0.0" port="7777" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="UnrealTournament ${defaultmap}?Game=${gametype}?TimeLimit=${timelimit} -port=${port}" } diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index c235f0746..0b49bd361 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -27,7 +27,6 @@ defaultmap="DM-Rankin" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care | fn_parms(){ parms="server ${defaultmap}?game=XGame.xDeathMatch -nohomedir ini=${servercfg} log=${gamelog}" } diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 0a62996d1..fff7c8cb4 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -27,7 +27,6 @@ defaultmap="DM-Deck16][" ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="server ${defaultmap}.unr ini=${servercfgfullpath}" } diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index 564473568..07ec5b7d9 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -22,11 +22,7 @@ version="170110" #### Server Settings #### -## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters -# Please use Enemy Territory config file. - ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="+set net_strict 1 +set fs_homepath ${filesdir} +exec ${servercfg}" } diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index cd765b480..c9140e9d0 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -27,7 +27,6 @@ version="170110" # No settings available for Just Cause 2 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -# Edit with care fn_parms(){ parms="" } diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index 82a4cc147..21c76309c 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -29,6 +29,7 @@ pushbullettoken="accesstoken" # Start Variables updateonstart="off" + fn_parms(){ parms="" } From 988d79e88a29748e852d27ddbf37e3358b404b76 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 15 Jan 2017 22:36:10 +0000 Subject: [PATCH 37/37] Prevents Legacy arkserver from failing issue was caused by a Typo in to word Survival --- lgsm/functions/core_functions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index 3a233174a..f4b6c47f7 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -6,7 +6,9 @@ # This function is called first before any other function. Without this file other functions will not load. # Fixes for legacy code -if [ "${gamename}" == "Teamspeak 3" ]; then +if [ "${gamename}" == "ARK: Survivial Evolved" ]; then + gamename="ARK: Survival Evolved" +elif [ "${gamename}" == "Teamspeak 3" ]; then gamename="TeamSpeak 3" elif [ "${gamename}" == "Counter Strike: Global Offensive" ]; then gamename="Counter-Strike: Global Offensive"