From b2b551518f5d531df43beadbe74d0b234dcb6586 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 19 Jun 2017 15:29:11 +0100 Subject: [PATCH 1/5] removed discord alerts as not quite ready yet. --- lgsm/config-default/config-lgsm/arkserver/_default.cfg | 4 ---- lgsm/config-default/config-lgsm/rustserver/_default.cfg | 4 ---- 2 files changed, 8 deletions(-) diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg index 2d059901d..b8cdf0c69 100644 --- a/lgsm/config-default/config-lgsm/arkserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/arkserver/_default.cfg @@ -34,10 +34,6 @@ pushbulletalert="off" pushbullettoken="accesstoken" channeltag="" -# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord -discordalert="off" -discordwebhook="https://discordapp.com/api/webhooks/12345/abcd12345" - ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg index 2d6a29e40..ff23f7fc7 100644 --- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg @@ -42,10 +42,6 @@ fi ## Notification Alerts # (on|off) -# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord -discordalert="off" -discordwebhook="https://discordapp.com/api/webhooks/12345/abcd12345" - # Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email emailalert="off" email="email@example.com" From 8b9157f361c50a854ac247d8471a226e67e89f8c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 19 Jun 2017 15:57:32 +0100 Subject: [PATCH 2/5] Corrected legacy scriptlogdate --- lgsm/functions/core_legacy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/core_legacy.sh b/lgsm/functions/core_legacy.sh index 938aeb845..44e271a4d 100644 --- a/lgsm/functions/core_legacy.sh +++ b/lgsm/functions/core_legacy.sh @@ -25,7 +25,7 @@ if [ -z "${lgsmlogdir}" ]; then lgsmlogdir="${scriptlogdir}" fi -if [ -z "${scriptlogdate}" ]; then +if [ -z "${lgsmlogdate}" ]; then lgsmlogdate="${scriptlogdate}" fi From 3ce654ab7c54989aa25b521334a80f29093646c8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 19 Jun 2017 16:10:08 +0100 Subject: [PATCH 3/5] Added note about where to edit LinuxGSM --- linuxgsm.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linuxgsm.sh b/linuxgsm.sh index a3fa7d397..c180aafcc 100644 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -8,6 +8,10 @@ # Website: https://gameservermanagers.com # DO NOT EDIT THIS FILE +# LinuxGSM configuration is no longer edited here +# To update your LinuxGSM config go to: +# lgsm/config-lgsm +# https://github.com/GameServerManagers/LinuxGSM/wiki/LinuxGSM-Config-Files # Debugging if [ -f ".dev-debug" ]; then From 28cc7bfd8224a011c0c4e744ae6ee080baa3e4fd Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 19 Jun 2017 16:26:29 +0100 Subject: [PATCH 4/5] Updated message to reflect new LinuxGSM config location --- lgsm/functions/check_ip.sh | 6 +++++- lgsm/functions/check_steamcmd.sh | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 622b617dd..ed37b6b25 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -39,7 +39,11 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi echo -en "https://gameservermanagers.com/network-interfaces\n" echo -en "" fn_script_log_fatal "Multiple active network interfaces found." - fn_script_log_fatal "Manually specify the IP you want to use within the ${selfname} script." + if [ "${legacymode}" == "1" ] then + fn_script_log_fatal "Manually specify the IP you want to use within the ${selfname} script." + else + fn_script_log_fatal "Manually specify the IP you want to use within: ${configdirserver}." + fi fn_script_log_fatal "https://gameservermanagers.com/network-interfaces\n" core_exit.sh else diff --git a/lgsm/functions/check_steamcmd.sh b/lgsm/functions/check_steamcmd.sh index dc4f66b8b..eb9e256d4 100644 --- a/lgsm/functions/check_steamcmd.sh +++ b/lgsm/functions/check_steamcmd.sh @@ -18,10 +18,17 @@ fn_install_steamcmd(){ fn_check_steamcmd_user(){ # Checks if steamuser is setup. if [ "${steamuser}" == "username" ]; then - fn_print_fail_nl "Steam login not set. Update steamuser in ${selfname}" + if [ "${legacymode}" == "1" ] then + fn_print_fail_nl "Steam login not set. Update steamuser in ${selfname}" + else + fn_print_fail_nl "Steam login not set. Update steamuser in ${configdirserver}" + fi echo " * Change steamuser=\"username\" to a valid steam login." if [ -d "${lgsmlogdir}" ]; then - fn_script_log_fatal "Steam login not set. Update steamuser in ${selfname}" + if [ "${legacymode}" == "1" ] then + fn_script_log_fatal "Steam login not set. Update steamuser in ${selfname}" + else + fn_script_log_fatal "Steam login not set. Update steamuser in ${configdirserver}" fi core_exit.sh fi From 4a21ddc7a347a3e9a0f964ba04d247a934cf1b76 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 19 Jun 2017 16:45:51 +0100 Subject: [PATCH 5/5] Added ARK to warning about lack of output --- lgsm/functions/command_console.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/command_console.sh b/lgsm/functions/command_console.sh index bbf215a96..1b2a0fa01 100644 --- a/lgsm/functions/command_console.sh +++ b/lgsm/functions/command_console.sh @@ -10,10 +10,10 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh fn_print_header -if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]; then +if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]||[ "${gamename}" == "ARK: Survival Evolved" ]; then fn_print_information_nl "${gamename} does not produce a verbose output to the console" fi -if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]; then +if [ "${gamename}" == "Rust" ]||[ "${gamename}" == "Hurtworld" ]||[ "${gamename}" == "ARK: Survival Evolved" ]; then fn_print_information_nl "${gamename} does not allow server commands to be entered in to the console" fi fn_print_information_nl "Press \"CTRL+b\" then \"d\" to exit console."