From 07d8878171f8fa66d807010b3bc1e2c1a09d6e36 Mon Sep 17 00:00:00 2001 From: Elizabeth Frazier Date: Sun, 20 Aug 2017 11:54:25 -0700 Subject: [PATCH 001/395] Change multi-IP detection messgeing in check_ip.sh; Alow command_details.sh to continue running after multi-IP detection. --- lgsm/functions/check_ip.sh | 5 +++-- lgsm/functions/command_details.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 468ac529a..9bb8b1a59 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -19,9 +19,10 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi info_config.sh if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then if [ "${getipwc}" -ge "2" ]; then - fn_print_dots "Check IP" + multiple_ip=1 + fn_print_dots "Check IP" sleep 1 - fn_print_fail "Check IP: Multiple active network interfaces found." + fn_print_warn "Check IP: Multiple active network interfaces found." sleep 1 echo -en "\n" if [ "${ipsetinconfig}" == "1" ]; then diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index 4e5eb2eca..8a4c59b14 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -116,8 +116,12 @@ fn_details_gameserver(){ fi # Server ip - echo -e "${blue}Server IP:\t${default}${ip}:${port}" - + if [ ${multiple_ip} == 1 ]; then + echo -e "${blue}Server IP:\t${default}NOT SET" + else + echo -e "${blue}Server IP:\t${default}${ip}:${port}" + fi + # Server password if [ -n "${serverpassword}" ]; then echo -e "${blue}Server password:\t${default}${serverpassword}" From 294cfe5730427a4c61f5780933f62cdc42de71c1 Mon Sep 17 00:00:00 2001 From: Elizabeth Frazier Date: Tue, 22 Aug 2017 10:01:05 -0700 Subject: [PATCH 002/395] Supress core_exit.sh when multiple IPs detected only when running details command --- lgsm/functions/check_ip.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 9bb8b1a59..9b7f4f5bd 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -22,7 +22,12 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi multiple_ip=1 fn_print_dots "Check IP" sleep 1 - fn_print_warn "Check IP: Multiple active network interfaces found." + command_arg=$(ps -o command $$ | tail -n +2 | cut -d' ' -f3) + if [[ "${command_arg}" = "details" ]] || [[ "${command_arg}" = "dt" ]] ; then + fn_print_warn "Check IP: Multiple active network interfaces found." + else + fn_print_fail "Check IP: Multiple active network interfaces found." + fi sleep 1 echo -en "\n" if [ "${ipsetinconfig}" == "1" ]; then @@ -46,7 +51,9 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi 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 + if [[ "${command_arg}" != "details" ]] && [[ "${command_arg}" != "dt" ]] ; then + core_exit.sh + fi else ip=${getip} fi From 1e91dda915c72d9c04daa211e1470f453100b30e Mon Sep 17 00:00:00 2001 From: Glenn Kintscher Date: Thu, 29 Mar 2018 16:29:28 +0200 Subject: [PATCH 003/395] Add Eco server --- .../config-lgsm/ecoserver/_default.cfg | 117 ++++++++++++++++++ lgsm/data/serverlist.csv | 1 + lgsm/functions/check_deps.sh | 65 ++++++++++ 3 files changed, 183 insertions(+) create mode 100644 lgsm/config-default/config-lgsm/ecoserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg new file mode 100644 index 000000000..7e5f185b5 --- /dev/null +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -0,0 +1,117 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login +steamuser="username" +steampass='password' + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ + parms="-nogui" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="739590" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta 7.3.0" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="Eco" +engine="unity3d" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}" +executabledir="${serverfiles}" +executable="mono ${serverfiles}/EcoServer.exe" +# TODO: Add config stuff + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${logdir}/server" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" +gamelogdate="${gamelogdir}/${servicename}-game-$(date '+%Y-%m-%d-%H:%M:%S').log" diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 7f81f81fb..687357cfc 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -24,6 +24,7 @@ doi,doiserver,Day of Infamy dmc,dmcserver,Deathmatch Classic dst,dstserver,Don't Starve Together dab,dabserver,Double Action: Boogaloo +eco,ecoserver,Eco em,emserver,Empires Mod fctr,fctrserver,Factorio fof,fofserver,Fistful of Frags diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index e296c33de..65f008052 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -6,6 +6,52 @@ local commandname="CHECK" +fn_add_mono_repo(){ + # TODO: Detect correct distro and version for source url + if [ "${monocheck}" != "0" ]; then + fn_print_dots_nl "Adding Mono repository" + sleep 0.5 + sudo -v > /dev/null 2>&1 + if [ $? -eq 0 ]; then + fn_print_information_nl "Automatically adding repository." + fn_script_log_info "Automatically adding repository." + echo -en ".\r" + sleep 1 + echo -en "..\r" + sleep 1 + echo -en "...\r" + sleep 1 + echo -en " \r" + if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && echo 'deb http://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && sudo apt-get update" + eval ${cmd} + elif [ -n "$(command -v yum 2>/dev/null)" ]; then + cmd="rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" + eval ${cmd} + fi + if [ $? != 0 ]; then + fn_print_failure_nl "Unable to add Mono repository" + fn_script_log_fatal "Unable to add Mono repository" + exit 1 + else + fn_print_complete_nl "Add Mono repository completed" + fn_script_log_pass "Add Mono repository completed" + fi + else + echo "" + fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Mono repository." + fn_script_log_warn "$(whoami) does not have sudo access. Manually add Mono repository." + if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + echo " sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && echo 'deb http://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && sudo apt-get update" + elif [ -n "$(command -v yum 2>/dev/null)" ]; then + echo " rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" + fi + echo "" + exit 1 + fi + fi +} + fn_deps_detector(){ # Checks if dependency is missing if [ "${tmuxcheck}" == "1" ]; then @@ -18,6 +64,15 @@ fn_deps_detector(){ depstatus=0 deptocheck="${javaversion}" unset javacheck + elif [ "${deptocheck}" == "mono-complete" ]; then + if [[ -n "$(mono --version)" && "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]]; then + # Mono >= 5.0.0 already installed + depstatus=0 + else + # Mono not installed or installed Mono < 5.0.0 + depstatus=1 + monocheck=1 + fi elif [ -n "$(command -v apt-get 2>/dev/null)" ]; then dpkg-query -W -f='${Status}' ${deptocheck} 2>/dev/null | grep -q -P '^install ok installed' depstatus=$? @@ -78,6 +133,10 @@ fn_found_missing_deps(){ fn_print_error_nl "Checking dependencies: missing: ${red}${array_deps_missing[@]}${default}" fn_script_log_error "Checking dependencies: missing: ${array_deps_missing[@]}" sleep 1 + if [ -n monocheck ]; then + fn_add_mono_repo + fi + sleep 1 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then fn_print_information_nl "Automatically installing missing dependencies." @@ -227,6 +286,9 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then # Unreal Tournament elif [ "${gamename}" == "Unreal Tournament" ]; then array_deps_required+=( unzip ) + # Eco + elif [ "${gamename}" == "Eco" ]; then + array_deps_required+=( mono-complete ) fi fn_deps_email fn_check_loop @@ -316,6 +378,9 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then # Unreal Tournament elif [ "${gamename}" == "Unreal Tournament" ]; then array_deps_required+=( unzip ) + # Eco + elif [ "${gamename}" == "Eco" ]; then + array_deps_required+=( mono-complete ) fi fn_deps_email fn_check_loop From ea8cc95c6ebb18e3fe757f66f77c46e04164ed5d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 8 May 2018 01:09:30 +0200 Subject: [PATCH 004/395] Fixes validate function appid var was set to an unset variable for unknown reason --- lgsm/functions/command_validate.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index cef68ce7c..34d48ca28 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -9,7 +9,6 @@ local commandaction="Validate" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_validation(){ - appid="${1}" echo "" echo -e " * Validating may overwrite some customised files." echo -en " * https://developer.valvesoftware.com/wiki/SteamCMD#Validate" From 978b7226ed3eedeef6aa053d8c301a16e573d4f9 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:10:27 +0300 Subject: [PATCH 005/395] Update _default.cfg I'm add a simple curl custom string for use curl with proxy in countries like Russia where Telegram has blocked. --- lgsm/config-default/config-lgsm/ts3server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg index a2411801f..40d4d5ec1 100644 --- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg @@ -50,9 +50,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From b9a1d8e43a74185729ba7510c94ed373eaccfa58 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:44:49 +0300 Subject: [PATCH 006/395] Update alert_telegram.sh --- lgsm/functions/alert_telegram.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh index 5d5cdddc8..cf14aafc3 100644 --- a/lgsm/functions/alert_telegram.sh +++ b/lgsm/functions/alert_telegram.sh @@ -19,7 +19,7 @@ EOF fn_print_dots "Sending Telegram alert" sleep 0.5 -telegramsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" | grep "error_code") +telegramsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" ${curlcustomstring} | grep "error_code") if [ -n "${telegramsend}" ]; then fn_print_fail_nl "Sending Telegram alert: ${telegramsend}" From 256daa71314396536ed0831f4e042881baee877e Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:45:59 +0300 Subject: [PATCH 007/395] Update _default.cfg --- lgsm/config-default/config-lgsm/arkserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg index 708167946..30fc359ad 100644 --- a/lgsm/config-default/config-lgsm/arkserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/arkserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From fdca9eb84d0422586995e91b4d23bc3d3f3a3ead Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:46:29 +0300 Subject: [PATCH 008/395] Update _default.cfg --- lgsm/config-default/config-lgsm/arma3server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/arma3server/_default.cfg b/lgsm/config-default/config-lgsm/arma3server/_default.cfg index 319d73304..0cb8c9688 100644 --- a/lgsm/config-default/config-lgsm/arma3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/arma3server/_default.cfg @@ -77,9 +77,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From d0f94645485b11c515ceb2ce82e14140f99221d6 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:46:54 +0300 Subject: [PATCH 009/395] Update _default.cfg --- lgsm/config-default/config-lgsm/bb2server/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg index 8e4b71a98..cbd89af35 100644 --- a/lgsm/config-default/config-lgsm/bb2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bb2server/_default.cfg @@ -67,9 +67,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -125,4 +129,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 62b745d10b31c64ccbce55bb7f5e65c82da5ffae Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:47:15 +0300 Subject: [PATCH 010/395] Update _default.cfg --- lgsm/config-default/config-lgsm/bdserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/bdserver/_default.cfg b/lgsm/config-default/config-lgsm/bdserver/_default.cfg index 6aefdd42e..f73974c77 100644 --- a/lgsm/config-default/config-lgsm/bdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bdserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -115,4 +119,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From a15a0befd6531ce77458fd10ae61ca695bedc13b Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:47:48 +0300 Subject: [PATCH 011/395] Update _default.cfg --- lgsm/config-default/config-lgsm/bf1942server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg index 449fa84ac..937b5f527 100644 --- a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg @@ -54,9 +54,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 359d5429ec6f83c7c5e6054439adfb7b123a87b1 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:48:07 +0300 Subject: [PATCH 012/395] Update _default.cfg --- lgsm/config-default/config-lgsm/bmdmserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg index d291dffd4..3832a7243 100644 --- a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg @@ -67,9 +67,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -125,4 +129,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 23eeefce64a563e278570fa1eab908e1f58dd97d Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:48:24 +0300 Subject: [PATCH 013/395] Update _default.cfg --- lgsm/config-default/config-lgsm/boserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/boserver/_default.cfg b/lgsm/config-default/config-lgsm/boserver/_default.cfg index cceed8f99..fb5ca9eb8 100644 --- a/lgsm/config-default/config-lgsm/boserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/boserver/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -118,4 +122,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 841b07334d4e900e73b6dfb9f91719e17a16b501 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:48:43 +0300 Subject: [PATCH 014/395] Update _default.cfg --- lgsm/config-default/config-lgsm/bsserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg index 4de2c7cb2..57da82867 100644 --- a/lgsm/config-default/config-lgsm/bsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bsserver/_default.cfg @@ -66,9 +66,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -124,4 +128,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From ca67a91e8d203cf02fdb76765269bca042c2bbda Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:49:04 +0300 Subject: [PATCH 015/395] Update _default.cfg --- lgsm/config-default/config-lgsm/bt1944server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg index 82befb17c..0a0401bda 100644 --- a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg @@ -59,9 +59,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 5ddbe0729f8dddaa3e2b5230b41f27117a7752cc Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:49:21 +0300 Subject: [PATCH 016/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ccserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg index 898c48558..56a857604 100644 --- a/lgsm/config-default/config-lgsm/ccserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ccserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -120,4 +124,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 79e439e431c0bcc7b92607fde2751fbcf2a552c8 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:49:39 +0300 Subject: [PATCH 017/395] Update _default.cfg --- lgsm/config-default/config-lgsm/cod2server/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg index ca622987f..e08904147 100644 --- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" @@ -107,4 +111,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From ea211d219ba0671701d8bbc7820a3de42d98952c Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:50:02 +0300 Subject: [PATCH 018/395] Update _default.cfg --- lgsm/config-default/config-lgsm/cod4server/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg index fd740266a..8791468f4 100644 --- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" @@ -107,4 +111,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 243051409749a743cd2141735cae595c49505bd5 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:50:21 +0300 Subject: [PATCH 019/395] Update _default.cfg --- lgsm/config-default/config-lgsm/codserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg index aa1796779..cefb601ba 100644 --- a/lgsm/config-default/config-lgsm/codserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" @@ -107,4 +111,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From df7b43ef84beb81aec9fc6dc552c513dc7ad7412 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:50:39 +0300 Subject: [PATCH 020/395] Update _default.cfg --- lgsm/config-default/config-lgsm/coduoserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg index ba33a4e83..07d306568 100644 --- a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" @@ -107,4 +111,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 3e8dffd74d6e0598dcc34d9b7270bbc0abcd038e Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:51:01 +0300 Subject: [PATCH 021/395] Update _default.cfg --- lgsm/config-default/config-lgsm/codwawserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg index b9d373e2d..e6061e809 100644 --- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" @@ -107,4 +111,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 0bdedd171b608bdd41ac872c5f4986472d994674 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:51:19 +0300 Subject: [PATCH 022/395] Update _default.cfg --- lgsm/config-default/config-lgsm/csczserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/csczserver/_default.cfg b/lgsm/config-default/config-lgsm/csczserver/_default.cfg index 0f7fcdf06..fb1115389 100644 --- a/lgsm/config-default/config-lgsm/csczserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csczserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From fa8791f6492b01c8cb716d62c2748c573b4ec798 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:51:40 +0300 Subject: [PATCH 023/395] Update _default.cfg --- lgsm/config-default/config-lgsm/csgoserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg index 034d46ae1..df0303752 100644 --- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg @@ -86,9 +86,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 35989cb06eb8659b9416ee3931ec1ef1a7e33d37 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:52:00 +0300 Subject: [PATCH 024/395] Update _default.cfg --- lgsm/config-default/config-lgsm/csserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/csserver/_default.cfg b/lgsm/config-default/config-lgsm/csserver/_default.cfg index 36accf304..8fb21ca5e 100644 --- a/lgsm/config-default/config-lgsm/csserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -120,4 +124,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From eba32bc0f20905e2d4eb3893a64a151fb986fef0 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:52:32 +0300 Subject: [PATCH 025/395] Update _default.cfg --- lgsm/config-default/config-lgsm/cssserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/cssserver/_default.cfg b/lgsm/config-default/config-lgsm/cssserver/_default.cfg index b2bce516d..48140dfa8 100644 --- a/lgsm/config-default/config-lgsm/cssserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/cssserver/_default.cfg @@ -67,9 +67,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 82464e85b0bb1198f80254d0f3a0cade1f49104c Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:52:52 +0300 Subject: [PATCH 026/395] Update _default.cfg --- lgsm/config-default/config-lgsm/dabserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/dabserver/_default.cfg b/lgsm/config-default/config-lgsm/dabserver/_default.cfg index bee302e3d..4ad34a64a 100644 --- a/lgsm/config-default/config-lgsm/dabserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dabserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 0b5c3486a4e741ae1035533f7818468d19d275ca Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:53:16 +0300 Subject: [PATCH 027/395] Update _default.cfg --- lgsm/config-default/config-lgsm/dmcserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg index 0c9363314..3b339436c 100644 --- a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From a57aa84d4b7a7bcca27a3a1fb5b5690af09fba14 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:53:44 +0300 Subject: [PATCH 028/395] Update _default.cfg --- lgsm/config-default/config-lgsm/dodserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/dodserver/_default.cfg b/lgsm/config-default/config-lgsm/dodserver/_default.cfg index 37dde5b38..8ff65c3ce 100644 --- a/lgsm/config-default/config-lgsm/dodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From f562ff0a302613e171347aea96a0968abd74fff2 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:54:05 +0300 Subject: [PATCH 029/395] Update _default.cfg --- lgsm/config-default/config-lgsm/doiserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/doiserver/_default.cfg b/lgsm/config-default/config-lgsm/doiserver/_default.cfg index d0660be38..bf99996c4 100644 --- a/lgsm/config-default/config-lgsm/doiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/doiserver/_default.cfg @@ -64,9 +64,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 0466f6a5103a0a1de18508a11fd1743dbf6fa40f Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:54:29 +0300 Subject: [PATCH 030/395] Update _default.cfg --- lgsm/config-default/config-lgsm/dstserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/dstserver/_default.cfg b/lgsm/config-default/config-lgsm/dstserver/_default.cfg index 960643c43..3137abfa4 100644 --- a/lgsm/config-default/config-lgsm/dstserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dstserver/_default.cfg @@ -65,9 +65,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 0c1b2511fcf9416f726d3d8a953fe4f2e42c74a2 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:54:47 +0300 Subject: [PATCH 031/395] Update _default.cfg --- lgsm/config-default/config-lgsm/emserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/emserver/_default.cfg b/lgsm/config-default/config-lgsm/emserver/_default.cfg index 3a579deb6..9f5e788fa 100644 --- a/lgsm/config-default/config-lgsm/emserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/emserver/_default.cfg @@ -67,9 +67,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From c7e94b285e18068b5b321e5d3f2f5ca5d721147b Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:55:08 +0300 Subject: [PATCH 032/395] Update _default.cfg --- lgsm/config-default/config-lgsm/etlserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/etlserver/_default.cfg b/lgsm/config-default/config-lgsm/etlserver/_default.cfg index f1b711fcc..5d431fd37 100644 --- a/lgsm/config-default/config-lgsm/etlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/etlserver/_default.cfg @@ -54,9 +54,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From e176dc286c03f2fda7e15e1d0f4b3c5cce36c612 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:55:27 +0300 Subject: [PATCH 033/395] Update _default.cfg --- lgsm/config-default/config-lgsm/fctrserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg index 44abf26e0..a3186b1de 100644 --- a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 4524f994ff2c536aedc178ff2696cb826c6d9de0 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:55:47 +0300 Subject: [PATCH 034/395] Update _default.cfg --- lgsm/config-default/config-lgsm/fofserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/fofserver/_default.cfg b/lgsm/config-default/config-lgsm/fofserver/_default.cfg index 326c6e7fe..5673b60d4 100644 --- a/lgsm/config-default/config-lgsm/fofserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fofserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From c5cc1f92c8ac99e327124e711f92c854dcb5538e Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:56:05 +0300 Subject: [PATCH 035/395] Update _default.cfg --- lgsm/config-default/config-lgsm/gesserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/gesserver/_default.cfg b/lgsm/config-default/config-lgsm/gesserver/_default.cfg index ab8bc255e..12a5bf362 100644 --- a/lgsm/config-default/config-lgsm/gesserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gesserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 185d6396384ad0ba8b04df3e9e777f8b2ac17b17 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:56:25 +0300 Subject: [PATCH 036/395] Update _default.cfg --- lgsm/config-default/config-lgsm/gmodserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg index ba881f036..e5e54e8a0 100644 --- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg @@ -78,9 +78,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From aa88aa88ad8619f7f64c728aaee3800ef868c978 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:56:45 +0300 Subject: [PATCH 037/395] Update _default.cfg --- lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg index 5f2f8c3ba..d25c02a67 100644 --- a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 4e7ef7c9f62d515921617160405322de71d3cf53 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:57:07 +0300 Subject: [PATCH 038/395] Update _default.cfg --- lgsm/config-default/config-lgsm/hldmserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg index 302b4b3d8..8b6f7aa8a 100644 --- a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 751e75e69c1a82ea6083fe5d6d607290a4cf4733 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:57:34 +0300 Subject: [PATCH 039/395] Update _default.cfg --- lgsm/config-default/config-lgsm/hldmsserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg index 624ee0047..2bb608f39 100644 --- a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From b18aa3950490c23c78d829c0078f577fbbe680c8 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:58:09 +0300 Subject: [PATCH 040/395] Update _default.cfg --- lgsm/config-default/config-lgsm/hwserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/hwserver/_default.cfg b/lgsm/config-default/config-lgsm/hwserver/_default.cfg index e3fdb7184..05fc0e331 100644 --- a/lgsm/config-default/config-lgsm/hwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hwserver/_default.cfg @@ -75,9 +75,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From b91a9bf623699a1a5733448bcfb7704e6e5c78fd Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:58:30 +0300 Subject: [PATCH 041/395] Update _default.cfg --- lgsm/config-default/config-lgsm/insserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/insserver/_default.cfg b/lgsm/config-default/config-lgsm/insserver/_default.cfg index 851766069..552c483fb 100644 --- a/lgsm/config-default/config-lgsm/insserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/insserver/_default.cfg @@ -69,9 +69,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 487ba01f93aad3cdee6ff0f4e40f7a246f4e98f7 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:58:48 +0300 Subject: [PATCH 042/395] Update _default.cfg --- lgsm/config-default/config-lgsm/jc2server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/jc2server/_default.cfg b/lgsm/config-default/config-lgsm/jc2server/_default.cfg index 6dafd3d93..f76a0ad9d 100644 --- a/lgsm/config-default/config-lgsm/jc2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc2server/_default.cfg @@ -54,9 +54,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From aa49f266119949d946adc89aff0130f7f97bb49b Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:59:07 +0300 Subject: [PATCH 043/395] Update _default.cfg --- lgsm/config-default/config-lgsm/jc3server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg index 84d0f0b22..80b13fe97 100644 --- a/lgsm/config-default/config-lgsm/jc3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg @@ -54,9 +54,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 44a75f126d5d3b9e35f939ba79a40fba7131a4a9 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:59:23 +0300 Subject: [PATCH 044/395] Update _default.cfg --- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index a5f8d6f65..9aaa98911 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From f97d20e3b3b16ef0451e88403348b1e28f036276 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Thu, 17 May 2018 23:59:46 +0300 Subject: [PATCH 045/395] Update _default.cfg --- lgsm/config-default/config-lgsm/kfserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/kfserver/_default.cfg b/lgsm/config-default/config-lgsm/kfserver/_default.cfg index fbb1d6ebf..0357f2daa 100644 --- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg @@ -66,9 +66,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 84389f20354c69851d0ddbe3dbd82df3c0a6472f Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:00:05 +0300 Subject: [PATCH 046/395] Update _default.cfg --- lgsm/config-default/config-lgsm/l4d2server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg index fb5e8bbb4..edddbe01a 100644 --- a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From f770e5ee1873659ed2d612a8c98e0206c40ac7d1 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:00:34 +0300 Subject: [PATCH 047/395] Update _default.cfg --- lgsm/config-default/config-lgsm/l4dserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg index 207c62944..15f27ada3 100644 --- a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 78f959dd82d96fe146dce4d988bd5bebc658141e Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:00:53 +0300 Subject: [PATCH 048/395] Update _default.cfg --- lgsm/config-default/config-lgsm/mcserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg index 881109b11..80339b11a 100644 --- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg @@ -56,9 +56,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 5b17f5588cb3d0da81ade7af86d3ec97b99c4850 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:01:10 +0300 Subject: [PATCH 049/395] Update _default.cfg --- lgsm/config-default/config-lgsm/mtaserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg index aee1e3508..9e5c2bb52 100644 --- a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg @@ -55,9 +55,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 26e0ca61a6bf0b74591d410d908156a28d17ed9f Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:01:28 +0300 Subject: [PATCH 050/395] Update _default.cfg --- lgsm/config-default/config-lgsm/mumbleserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg index 3fb7634a0..5832e70e5 100644 --- a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg @@ -55,9 +55,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 4fed56b1ebee4ec2ccd69a3deee3ccd1b7ea8844 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:01:48 +0300 Subject: [PATCH 051/395] Update _default.cfg --- lgsm/config-default/config-lgsm/nmrihserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg index 61e738112..3d85a50a4 100644 --- a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg @@ -67,9 +67,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 1dc847da37d341ac249ac0c1b02e01b4cad18bd9 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:02:14 +0300 Subject: [PATCH 052/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ns2cserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg index 956366c80..cb6d3249f 100644 --- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg @@ -69,9 +69,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From a22f1a61460c96a27a11d2b9c6f711cf24abfbf7 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:02:36 +0300 Subject: [PATCH 053/395] Update _default.cfg --- lgsm/config-default/config-lgsm/opforserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/opforserver/_default.cfg b/lgsm/config-default/config-lgsm/opforserver/_default.cfg index 2d8ad75ae..79cde28c3 100644 --- a/lgsm/config-default/config-lgsm/opforserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/opforserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 840066e0bf26b814f00339b216119eb041df9504 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:03:08 +0300 Subject: [PATCH 054/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ns2server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg index 902c0d33d..195289fb1 100644 --- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg @@ -73,9 +73,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From e193aa18f8d7d563118591d0678d0202096ec5ea Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:03:27 +0300 Subject: [PATCH 055/395] Update _default.cfg --- lgsm/config-default/config-lgsm/pcserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/pcserver/_default.cfg b/lgsm/config-default/config-lgsm/pcserver/_default.cfg index b9815fd13..271410ddb 100644 --- a/lgsm/config-default/config-lgsm/pcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pcserver/_default.cfg @@ -55,9 +55,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From afed0a33416947cf214192070cf9bec5c9574a90 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:04:01 +0300 Subject: [PATCH 056/395] Update _default.cfg --- lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg index 6fb51cfbc..6e404b837 100644 --- a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 061e083a44ffdcdbaf4a7da31fa9978a247c96f9 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:04:21 +0300 Subject: [PATCH 057/395] Update _default.cfg --- lgsm/config-default/config-lgsm/dodsserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg index 60b8c84bf..a05e70771 100644 --- a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 92d1c7db2649fd84d1eaf33f3aaba347c4a50d54 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:04:48 +0300 Subject: [PATCH 058/395] Update _default.cfg --- lgsm/config-default/config-lgsm/pzserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/pzserver/_default.cfg b/lgsm/config-default/config-lgsm/pzserver/_default.cfg index 05f69be0c..7450c3642 100644 --- a/lgsm/config-default/config-lgsm/pzserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pzserver/_default.cfg @@ -57,9 +57,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 4ad8b39c4a7952f1240ec33286cbee1856ad2552 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:05:14 +0300 Subject: [PATCH 059/395] Update _default.cfg --- lgsm/config-default/config-lgsm/q2server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/q2server/_default.cfg b/lgsm/config-default/config-lgsm/q2server/_default.cfg index ca2c309ec..38fbffaa5 100644 --- a/lgsm/config-default/config-lgsm/q2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q2server/_default.cfg @@ -59,9 +59,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 9bb68562b54b8ee763f2429cccaf9d7a563b6e50 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:05:36 +0300 Subject: [PATCH 060/395] Update _default.cfg --- lgsm/config-default/config-lgsm/q3server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/q3server/_default.cfg b/lgsm/config-default/config-lgsm/q3server/_default.cfg index 997c9ff83..6ef4e7005 100644 --- a/lgsm/config-default/config-lgsm/q3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q3server/_default.cfg @@ -59,9 +59,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 2f30f2ac51457a4d89fb1b3a0d9005cd85525758 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:06:01 +0300 Subject: [PATCH 061/395] Update _default.cfg --- lgsm/config-default/config-lgsm/qlserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg index d5e19bc22..f7f790ded 100644 --- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg @@ -59,9 +59,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 89452422a76a2d03f4497426d33b4d7660f5c8a4 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:06:30 +0300 Subject: [PATCH 062/395] Update _default.cfg --- lgsm/config-default/config-lgsm/qwserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/qwserver/_default.cfg b/lgsm/config-default/config-lgsm/qwserver/_default.cfg index ac8005f53..74095abb6 100644 --- a/lgsm/config-default/config-lgsm/qwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qwserver/_default.cfg @@ -58,9 +58,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 8a64690760a85d951fe43445810d4a6759ff6fa8 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:06:59 +0300 Subject: [PATCH 063/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ricochetserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg index 3d553900e..7ed3dc8ef 100644 --- a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From afde1605ec5ac0ec073f1ca4f2369a322b1b58a4 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:07:21 +0300 Subject: [PATCH 064/395] Update _default.cfg --- lgsm/config-default/config-lgsm/roserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg index 8d678f872..bb3824bbc 100644 --- a/lgsm/config-default/config-lgsm/roserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From f5eb6a20646580638880925c67f8e996aa9f9f3b Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:07:43 +0300 Subject: [PATCH 065/395] Update _default.cfg --- lgsm/config-default/config-lgsm/rustserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg index 1ac4b4db1..4a199356b 100644 --- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg @@ -86,9 +86,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 788cced747fd5a8997713d2f5f5d80a7aa186eea Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:08:11 +0300 Subject: [PATCH 066/395] Update _default.cfg --- lgsm/config-default/config-lgsm/rwserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/rwserver/_default.cfg b/lgsm/config-default/config-lgsm/rwserver/_default.cfg index 7bf824059..46b4e77de 100644 --- a/lgsm/config-default/config-lgsm/rwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rwserver/_default.cfg @@ -57,9 +57,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 4f96e5c36b41ad0bcb1a75f38193dcd6f224c012 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:08:30 +0300 Subject: [PATCH 067/395] Update _default.cfg --- lgsm/config-default/config-lgsm/sampserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/sampserver/_default.cfg b/lgsm/config-default/config-lgsm/sampserver/_default.cfg index 07d30a73b..dab916838 100644 --- a/lgsm/config-default/config-lgsm/sampserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sampserver/_default.cfg @@ -58,9 +58,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 4c9db32bca4bacb20b7925040879e9ba78603f84 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:08:56 +0300 Subject: [PATCH 068/395] Update _default.cfg --- lgsm/config-default/config-lgsm/sbserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/sbserver/_default.cfg b/lgsm/config-default/config-lgsm/sbserver/_default.cfg index b2fa9234d..ee4be268a 100644 --- a/lgsm/config-default/config-lgsm/sbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From cbb5b1834fc03d1923fa881c825b911a9c7fa489 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:09:23 +0300 Subject: [PATCH 069/395] Update _default.cfg --- lgsm/config-default/config-lgsm/sdtdserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg index ca26f1c7e..5be127534 100644 --- a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg @@ -57,9 +57,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From e15381190a40a8dbbb4db5a2f6564f91ad3ad5ff Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:09:43 +0300 Subject: [PATCH 070/395] Update _default.cfg --- lgsm/config-default/config-lgsm/squadserver/_default.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/squadserver/_default.cfg b/lgsm/config-default/config-lgsm/squadserver/_default.cfg index 990aa678b..22aac5113 100644 --- a/lgsm/config-default/config-lgsm/squadserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/squadserver/_default.cfg @@ -60,9 +60,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" @@ -119,4 +123,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" ## Logs Naming lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 8ea73e997168a69f161770ea08ce28c15f3afcd3 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:10:03 +0300 Subject: [PATCH 071/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ss3server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ss3server/_default.cfg b/lgsm/config-default/config-lgsm/ss3server/_default.cfg index d54bd259b..80f15e06c 100644 --- a/lgsm/config-default/config-lgsm/ss3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ss3server/_default.cfg @@ -58,9 +58,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From a7b1ad8b6865c1bc7120841911dc5a67ef978cb7 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:10:28 +0300 Subject: [PATCH 072/395] Update _default.cfg --- lgsm/config-default/config-lgsm/stserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/stserver/_default.cfg b/lgsm/config-default/config-lgsm/stserver/_default.cfg index cc0e2aa08..0c05dce03 100644 --- a/lgsm/config-default/config-lgsm/stserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/stserver/_default.cfg @@ -64,9 +64,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 3458fa3ae093c3e5203b00bb6dc904f724325e3c Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:10:47 +0300 Subject: [PATCH 073/395] Update _default.cfg --- lgsm/config-default/config-lgsm/svenserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/svenserver/_default.cfg b/lgsm/config-default/config-lgsm/svenserver/_default.cfg index 455e170a1..9b44c7be9 100644 --- a/lgsm/config-default/config-lgsm/svenserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/svenserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From e864e005e6cc2c63b879744089ee0143e56ecda6 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:11:14 +0300 Subject: [PATCH 074/395] Update _default.cfg --- lgsm/config-default/config-lgsm/terrariaserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg index 8e4e246e6..ba5fa8e62 100644 --- a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 9e311cab6f6047c90e983e78e1e4b521702b80fa Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:11:35 +0300 Subject: [PATCH 075/395] Update _default.cfg --- lgsm/config-default/config-lgsm/tf2server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/tf2server/_default.cfg b/lgsm/config-default/config-lgsm/tf2server/_default.cfg index 831966588..ebeddf6e6 100644 --- a/lgsm/config-default/config-lgsm/tf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/tf2server/_default.cfg @@ -67,9 +67,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 0033dc74d5e1f2aadbf8e8c311cc797690185c50 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:11:56 +0300 Subject: [PATCH 076/395] Update _default.cfg --- lgsm/config-default/config-lgsm/tfcserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg index 7836c5c29..bdb269f73 100644 --- a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 17a350149e6f5b8e3383eb7958cf4071272f7a65 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:12:16 +0300 Subject: [PATCH 077/395] Update _default.cfg --- lgsm/config-default/config-lgsm/tuserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/tuserver/_default.cfg b/lgsm/config-default/config-lgsm/tuserver/_default.cfg index 2de7c4cdf..c029a28bf 100644 --- a/lgsm/config-default/config-lgsm/tuserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tuserver/_default.cfg @@ -64,9 +64,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From e198a0437646e1ae4815bf0cf5b0dd3c00eb5543 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:12:39 +0300 Subject: [PATCH 078/395] Update _default.cfg --- lgsm/config-default/config-lgsm/twserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg index 81ee6196b..8139d6106 100644 --- a/lgsm/config-default/config-lgsm/twserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/twserver/_default.cfg @@ -61,9 +61,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 98cd93e7efce1f973f807ebf30992da0d8f9d1d9 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:12:57 +0300 Subject: [PATCH 079/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ut2k4server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg index c4ea0cf52..0a71b7259 100644 --- a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg @@ -58,9 +58,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 1b036eef3eab82b46aaac21d8fe2dc3c637a581f Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:13:20 +0300 Subject: [PATCH 080/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index 3469c4940..ffa8bc462 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -69,9 +69,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From cc23100c4a6cacbbc8c930406069c7de2918767f Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:13:36 +0300 Subject: [PATCH 081/395] Update _default.cfg --- lgsm/config-default/config-lgsm/ut99server/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/ut99server/_default.cfg b/lgsm/config-default/config-lgsm/ut99server/_default.cfg index ae87abb88..56dc8592d 100644 --- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg @@ -58,9 +58,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 88f2ce544b8aafb7776f7f8913c22ab756148f42 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:13:53 +0300 Subject: [PATCH 082/395] Update _default.cfg --- lgsm/config-default/config-lgsm/utserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/utserver/_default.cfg b/lgsm/config-default/config-lgsm/utserver/_default.cfg index 1433496c8..57a489d7d 100644 --- a/lgsm/config-default/config-lgsm/utserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/utserver/_default.cfg @@ -62,9 +62,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From 5ec3606fa2aef5d57b64c0678850b5b2479e11c9 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:14:13 +0300 Subject: [PATCH 083/395] Update _default.cfg --- lgsm/config-default/config-lgsm/wetserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/wetserver/_default.cfg b/lgsm/config-default/config-lgsm/wetserver/_default.cfg index 1542bcb13..7b5ed581b 100644 --- a/lgsm/config-default/config-lgsm/wetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wetserver/_default.cfg @@ -54,9 +54,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup maxbackups="4" From d50e5062e7a7d1a06001aabae99137978d1b32f6 Mon Sep 17 00:00:00 2001 From: Kirill Shamilin Date: Fri, 18 May 2018 00:14:30 +0300 Subject: [PATCH 084/395] Update _default.cfg --- lgsm/config-default/config-lgsm/zpsserver/_default.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg index dcada8f4e..623731930 100644 --- a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg @@ -67,9 +67,13 @@ pushoveralert="off" pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" telegramchatid="" +curlcustomstring="" ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update updateonstart="off" From 9ee71e21e0c4394eedbc2ad63a9c890349556edd Mon Sep 17 00:00:00 2001 From: MissVoxxie Date: Tue, 5 Jun 2018 20:30:22 -0400 Subject: [PATCH 085/395] mod_list Update / Fix Fixed PAC3 not being in Global Array Added Wiremod AutoInstaller Added Wiremod-Extras AutoInstaller --- lgsm/functions/mods_list.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index dd5ab02c0..177b93a9f 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -59,6 +59,7 @@ modseparator="MOD" # Source mods mod_info_metamod=( MOD "metamod" "MetaMod" "${metamodurl}" "${metamodlatestfile}" "0" "LowercaseOff" "${systemdir}" "addons/metamod/metaplugins.ini;" "source;" "GAMES" "NOTGAMES" "https://www.sourcemm.net" "Plugins Framework" ) mod_info_sourcemod=( MOD "sourcemod" "SourceMod" "${sourcemodurl}" "${sourcemodlatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "source;" "GAMES" "NOTGAMES" "http://www.sourcemod.net" "Admin Features (requires MetaMod)" ) + # Garry's Mod Addons mod_info_ulib=( MOD "ulib" "ULib" "https://codeload.github.com/TeamUlysses/ulib/zip/master" "ulib-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "Complete Framework" ) mod_info_ulx=( MOD "ulx" "ULX" "https://codeload.github.com/TeamUlysses/ulx/zip/master" "ulx-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "Admin Panel (requires ULib)" ) @@ -67,13 +68,17 @@ mod_info_uclip=( MOD "uclip" "UClip" "https://github.com/TeamUlysses/uclip/archi mod_info_acf=( MOD "acf" "Armoured Combat Framework" "https://github.com/nrlulz/ACF/archive/master.zip" "acf-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "acf-master/lua/acf/shared/guns;" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/nrlulz/ACF" "Realistic Wepons & Engines" ) mod_info_acf_missiles=( MOD "acfmissiles" "ACF Missiles" "https://github.com/Bubbus/ACF-Missiles/archive/master.zip" "acf-missiles-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Bubbus/ACF-Missiles" "More missiles for ACF" ) mod_info_advdupe2=( MOD "advdupe2" "Advanced Duplicator 2" "https://github.com/wiremod/advdupe2/archive/master.zip" "advdupe2-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://www.wiremod.com" "Save your constructions" ) +mod_info_pac3=( MOD "pac3" "PAC3" "https://github.com/CapsAdmin/pac3/archive/master.zip" "pac3-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/CapsAdmin/pac3" "Advanced player model customization" ) +mod_info_wiremod=( MOD "wiremod" "Wiremod" "https://github.com/wiremod/wire/archive/master.zip" "wire-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/wiremod/wire" "Base Wiremod Addon") +mod_info_wiremodextras=( MOD "wiremod-extras" "Wiremod Extras" "https://github.com/wiremod/wire-extras/archive/master.zip" "wire-extras-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/wiremod/wire-extras/" "Addition to Wiremod, Extra Content") mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/gamemodes" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" ) mod_info_darkrpmodification=( MOD "darkrpmodification" "DarkRP Modification" "https://github.com/FPtje/darkrpmodification/archive/master.zip" "darkrpmodification-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "NOUPDATE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Customize DarkRP settings" ) -mod_info_pac=( MOD "pac3" "PAC3" "https://github.com/CapsAdmin/pac3/archive/master.zip" "pac3-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/CapsAdmin/pac3" "Advanced player model customization" ) + + # Oxidemod mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "${oxiderustlatestlink}" "Oxide.Rust.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-rust.1659/" "Allows for the use of plugins" ) mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "${oxidehurtworldlatestlink}" "Oxide.Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-hurtworld.1332/" "Allows for the use of plugins" ) mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "${oxidesdtdlatestlink}" "Oxide.SevenDaysToDie.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-7-days-to-die.813/" "Allows for the use of plugins" ) # REQUIRED: Set all mods info into the global array -mods_global_array=( "${mod_info_metamod[@]}" "${mod_info_sourcemod[@]}" "${mod_info_ulib[@]}" "${mod_info_ulx[@]}" "${mod_info_utime[@]}" "${mod_info_uclip[@]}" "${mod_info_acf[@]}" "${mod_info_acf_missiles[@]}" "${mod_info_acf_sweps[@]}" "${mod_info_advdupe2[@]}" "${mod_info_darkrp[@]}" "${mod_info_darkrpmodification[@]}" "${mod_info_rustoxide[@]}" "${mod_info_hwoxide[@]}" "${mod_info_sdtdoxide[@]}" ) +mods_global_array=( "${mod_info_metamod[@]}" "${mod_info_sourcemod[@]}" "${mod_info_ulib[@]}" "${mod_info_ulx[@]}" "${mod_info_utime[@]}" "${mod_info_uclip[@]}" "${mod_info_acf[@]}" "${mod_info_acf_missiles[@]}" "${mod_info_acf_sweps[@]}" "${mod_info_advdupe2[@]}" "${mod_info_pac3[@]}" "${mod_info_wiremod[@]}" "${mod_info_wiremodextras[@]}" "${mod_info_darkrp[@]}" "${mod_info_darkrpmodification[@]}" "${mod_info_rustoxide[@]}" "${mod_info_hwoxide[@]}" "${mod_info_sdtdoxide[@]}" ) From 9e4e141245dd861e9a02439a5eb73e491e1c21ff Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 12 Jun 2018 17:40:35 +0100 Subject: [PATCH 086/395] tidy --- lgsm/functions/info_config.sh | 2 -- lgsm/functions/info_messages.sh | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 68592afe2..bacd0fbb3 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -797,8 +797,6 @@ fn_info_config_kf2(){ webadminport=${webadminport:-"0"} webadminuser=${webadminuser:-"NOT SET"} webadminpass=${webadminpass:-"NOT SET"} - - fi } diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 0151ad00c..b2c125fc1 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -740,7 +740,7 @@ fn_info_message_quakelive(){ fi { echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" - echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> Game/Query\tINBOUND\t${port}\tudp" echo -e "> Rcon\tINBOUND\t${rconport}\tudp" echo -e "> Stats\tINBOUND\t${statsport}\tudp" } | column -s $'\t' -t @@ -894,7 +894,7 @@ fn_info_message_starbound(){ echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" echo -e "> Game\tINBOUND\t${port}\ttcp" echo -e "> Query\tINBOUND\t${queryport}\ttcp" - echo -e "> Rcon\tINBOUND\t${rconport}\ttcp" + echo -e "> RCON\tINBOUND\t${rconport}\ttcp" } | column -s $'\t' -t } From bc23ca5740a4eb22007278c5db89cd0b21d386f2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 12 Jun 2018 17:51:13 +0100 Subject: [PATCH 087/395] Changed to Anonymous --- lgsm/config-default/config-lgsm/ecoserver/_default.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index 7e5f185b5..6d5f3fb27 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -8,10 +8,6 @@ #### Server Settings #### -## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login -steamuser="username" -steampass='password' - ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ parms="-nogui" From 1bd787e04862ab2989f69c20072356030b201a16 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 12 Jun 2018 19:34:02 +0100 Subject: [PATCH 088/395] Updated eco info --- .../config-lgsm/ecoserver/_default.cfg | 4 +-- lgsm/functions/info_config.sh | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index 6d5f3fb27..df24e6ca3 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -91,8 +91,8 @@ engine="unity3d" ## Server Specific Directories systemdir="${serverfiles}" executabledir="${serverfiles}" -executable="mono ${serverfiles}/EcoServer.exe" -# TODO: Add config stuff +executable="mono ./EcoServer.exe" +servercfgdir="${systemdir}/Configs/" ## Backup Directory backupdir="${rootdir}/backups" diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index bacd0fbb3..e3af1dd00 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -252,6 +252,34 @@ fn_info_config_dontstarve(){ fi } +fn_info_config_eco(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + serverpassword="${unavailable}" + maxplayers="${zero}" + gamemode="${unavailable}" + tickrate="${zero}" + port="${zero}" + webadminport="${zero}" + public="" + else + servername=$(grep "Description" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Description//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + serverpassword=$(grep "Password" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + maxplayers=$(grep "\"MaxConnections\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') + port=$(grep "\"GameServerPort\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') + webadminport=$(grep "\"WebServerPort\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') + public=$(grep "PublicServer" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/PublicServer//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + + # Not Set + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + maxplayers=${maxplayers=:-"0"} + port=${port=:-"0"} + webadminport=${webadminport=:-"0"} + public=${public=:-"NOT SET"} + fi +} + fn_info_config_factorio(){ if [ ! -f "${servercfgfullpath}" ]; then servername="Factorio Server" @@ -1020,6 +1048,9 @@ elif [ "${gamename}" == "Call of Duty: World at War" ]; then # Dont Starve Together elif [ "${engine}" == "dontstarve" ]; then fn_info_config_dontstarve +# Eco +elif [ "${shortname}" == "eco" ]; then + fn_info_config_eco # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_config_factorio From df803d815e1075649358dabb780c3e817aa82763 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 12 Jun 2018 19:47:39 +0100 Subject: [PATCH 089/395] Updated servercfgpath --- lgsm/config-default/config-lgsm/ecoserver/_default.cfg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index df24e6ca3..426ef5781 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -92,7 +92,9 @@ engine="unity3d" systemdir="${serverfiles}" executabledir="${serverfiles}" executable="mono ./EcoServer.exe" -servercfgdir="${systemdir}/Configs/" +servercfgdefault="Network.eco" +servercfgdir="${systemdir}/Configs" +servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory backupdir="${rootdir}/backups" From 66574b61879f337938db5237a7c3ad1b2eb866dd Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 12 Jun 2018 19:50:09 +0100 Subject: [PATCH 090/395] added servercfg --- lgsm/config-default/config-lgsm/ecoserver/_default.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index 426ef5781..459916d6d 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -92,6 +92,7 @@ engine="unity3d" systemdir="${serverfiles}" executabledir="${serverfiles}" executable="mono ./EcoServer.exe" +servercfg="Network.eco" servercfgdefault="Network.eco" servercfgdir="${systemdir}/Configs" servercfgfullpath="${servercfgdir}/${servercfg}" From 0b2022237e2e016fabd7147c2b646f7a9a16fda0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 12 Jun 2018 19:56:46 +0100 Subject: [PATCH 091/395] altered maxplayers to allow for a - --- lgsm/functions/info_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index e3af1dd00..72738f00d 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -265,7 +265,7 @@ fn_info_config_eco(){ else servername=$(grep "Description" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Description//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') serverpassword=$(grep "Password" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - maxplayers=$(grep "\"MaxConnections\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') + maxplayers=$(grep "MaxConnections" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/MaxConnections//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') port=$(grep "\"GameServerPort\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') webadminport=$(grep "\"WebServerPort\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') public=$(grep "PublicServer" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/PublicServer//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') From d3edf19e92391eb51597a490361ec67493a6c043 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 17:49:46 +0100 Subject: [PATCH 092/395] Added Eco to telnet query --- lgsm/functions/command_monitor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index f68fa2e33..1febd053a 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -186,7 +186,7 @@ if [ "${gamename}" == "Starbound" ]; then if [ "${queryenabled}" == "true" ]; then fn_monitor_query fi -elif [ "${gamename}" == "TeamSpeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Eco" ]; then fn_monitor_query_telnet else fn_monitor_query From 5102547a7812e43ba5f994518d6402936d81e267 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 17:53:50 +0100 Subject: [PATCH 093/395] added queryport for eco --- lgsm/functions/info_parms.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index f1c5d81fc..57bc5bc30 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -41,6 +41,11 @@ fn_info_parms_dst(){ cave=${cave:-"NOT SET"} } +fn_info_parms_eco(){ + queryport=${port} +} + + fn_info_parms_factorio(){ port=${port:-"0"} rconport=${rconport:-"0"} @@ -147,6 +152,9 @@ elif [ "${engine}" == "realvirtuality" ]; then # Call of Duty elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty: United Offensive" ]||[ "${engine}" == "iw2.0" ]||[ "${engine}" == "iw3.0" ]; then fn_info_parms_cod +# Eco +elif [ "${gamename}" == "Eco" ]; then + fn_info_parms_eco # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_parms_factorio From dfefb1b2a1559d3a37be2337d04f50a2e8a11c9e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 18:31:43 +0100 Subject: [PATCH 094/395] Changed query port to webadminport --- lgsm/functions/info_parms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 57bc5bc30..f1ecf21f7 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -42,7 +42,7 @@ fn_info_parms_dst(){ } fn_info_parms_eco(){ - queryport=${port} + queryport=${webadminport} } From 9ef00773ec4fa0281656e5b1cdbc723b4f9a6f82 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 18:38:42 +0100 Subject: [PATCH 095/395] Updated details for Eco --- lgsm/functions/info_messages.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index b2c125fc1..52083921c 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -438,7 +438,7 @@ fn_info_message_ports(){ parmslocation="${red}UNKNOWN${default}" # engines/games that require editing in the config file - local ports_edit_array=( "avalanche2.0" "avalanche3.0" "Ballistic Overkill" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "Stationeers" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) + local ports_edit_array=( "avalanche2.0" "avalanche3.0" "Ballistic Overkill" "dontstarve" "Eco" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "Stationeers" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) for port_edit in "${ports_edit_array[@]}" do if [ "${shortname}" == "ut3" ]; then @@ -616,6 +616,16 @@ fn_info_message_dontstarve(){ } | column -s $'\t' -t } +fn_info_message_eco(){ + echo -e "netstat -atunp | grep mono" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> WebAdmin\tINBOUND\t${webadminport}\ttcp" + } | column -s $'\t' -t +} + fn_info_message_factorio(){ echo -e "netstat -atunp | grep factorio" echo -e "" @@ -1082,6 +1092,8 @@ fn_info_message_select_engine(){ fn_info_message_cod4 elif [ "${gamename}" == "Call of Duty: World at War" ]; then fn_info_message_codwaw + elif [ "${gamename}" == "Eco" ]; then + fn_info_message_eco elif [ "${gamename}" == "ET: Legacy" ]; then fn_info_message_etlegacy elif [ "${gamename}" == "Factorio" ]; then From 87c19a83d2401e00c445632ec25925f1cf800a50 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 18:48:14 +0100 Subject: [PATCH 096/395] Created ecoserver --- .../config-lgsm/ecoserver/_default.cfg | 11 +++---- lgsm/functions/command_monitor.sh | 2 +- lgsm/functions/info_config.sh | 31 +++++++++++++++++++ lgsm/functions/info_messages.sh | 14 ++++++++- lgsm/functions/info_parms.sh | 8 +++++ 5 files changed, 58 insertions(+), 8 deletions(-) diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index 7e5f185b5..459916d6d 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -8,10 +8,6 @@ #### Server Settings #### -## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login -steamuser="username" -steampass='password' - ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ parms="-nogui" @@ -95,8 +91,11 @@ engine="unity3d" ## Server Specific Directories systemdir="${serverfiles}" executabledir="${serverfiles}" -executable="mono ${serverfiles}/EcoServer.exe" -# TODO: Add config stuff +executable="mono ./EcoServer.exe" +servercfg="Network.eco" +servercfgdefault="Network.eco" +servercfgdir="${systemdir}/Configs" +servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory backupdir="${rootdir}/backups" diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index f68fa2e33..1febd053a 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -186,7 +186,7 @@ if [ "${gamename}" == "Starbound" ]; then if [ "${queryenabled}" == "true" ]; then fn_monitor_query fi -elif [ "${gamename}" == "TeamSpeak 3" ]; then +elif [ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Eco" ]; then fn_monitor_query_telnet else fn_monitor_query diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index bacd0fbb3..72738f00d 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -252,6 +252,34 @@ fn_info_config_dontstarve(){ fi } +fn_info_config_eco(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + serverpassword="${unavailable}" + maxplayers="${zero}" + gamemode="${unavailable}" + tickrate="${zero}" + port="${zero}" + webadminport="${zero}" + public="" + else + servername=$(grep "Description" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Description//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + serverpassword=$(grep "Password" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + maxplayers=$(grep "MaxConnections" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/MaxConnections//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + port=$(grep "\"GameServerPort\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') + webadminport=$(grep "\"WebServerPort\"" "${servercfgdir}/Network.eco" | tr -cd '[:digit:]') + public=$(grep "PublicServer" "${servercfgdir}/Network.eco" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/PublicServer//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + + # Not Set + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + maxplayers=${maxplayers=:-"0"} + port=${port=:-"0"} + webadminport=${webadminport=:-"0"} + public=${public=:-"NOT SET"} + fi +} + fn_info_config_factorio(){ if [ ! -f "${servercfgfullpath}" ]; then servername="Factorio Server" @@ -1020,6 +1048,9 @@ elif [ "${gamename}" == "Call of Duty: World at War" ]; then # Dont Starve Together elif [ "${engine}" == "dontstarve" ]; then fn_info_config_dontstarve +# Eco +elif [ "${shortname}" == "eco" ]; then + fn_info_config_eco # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_config_factorio diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index b2c125fc1..52083921c 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -438,7 +438,7 @@ fn_info_message_ports(){ parmslocation="${red}UNKNOWN${default}" # engines/games that require editing in the config file - local ports_edit_array=( "avalanche2.0" "avalanche3.0" "Ballistic Overkill" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "Stationeers" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) + local ports_edit_array=( "avalanche2.0" "avalanche3.0" "Ballistic Overkill" "dontstarve" "Eco" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "Stationeers" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) for port_edit in "${ports_edit_array[@]}" do if [ "${shortname}" == "ut3" ]; then @@ -616,6 +616,16 @@ fn_info_message_dontstarve(){ } | column -s $'\t' -t } +fn_info_message_eco(){ + echo -e "netstat -atunp | grep mono" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> WebAdmin\tINBOUND\t${webadminport}\ttcp" + } | column -s $'\t' -t +} + fn_info_message_factorio(){ echo -e "netstat -atunp | grep factorio" echo -e "" @@ -1082,6 +1092,8 @@ fn_info_message_select_engine(){ fn_info_message_cod4 elif [ "${gamename}" == "Call of Duty: World at War" ]; then fn_info_message_codwaw + elif [ "${gamename}" == "Eco" ]; then + fn_info_message_eco elif [ "${gamename}" == "ET: Legacy" ]; then fn_info_message_etlegacy elif [ "${gamename}" == "Factorio" ]; then diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index f1c5d81fc..f1ecf21f7 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -41,6 +41,11 @@ fn_info_parms_dst(){ cave=${cave:-"NOT SET"} } +fn_info_parms_eco(){ + queryport=${webadminport} +} + + fn_info_parms_factorio(){ port=${port:-"0"} rconport=${rconport:-"0"} @@ -147,6 +152,9 @@ elif [ "${engine}" == "realvirtuality" ]; then # Call of Duty elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty: United Offensive" ]||[ "${engine}" == "iw2.0" ]||[ "${engine}" == "iw3.0" ]; then fn_info_parms_cod +# Eco +elif [ "${gamename}" == "Eco" ]; then + fn_info_parms_eco # Factorio elif [ "${gamename}" == "Factorio" ]; then fn_info_parms_factorio From 3b9cf0857a14c240a8dd53c3bfa301bc9177ff94 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 19:08:33 +0100 Subject: [PATCH 097/395] added missing unreal engine to gamedig query --- lgsm/functions/query_gamedig.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 4249f8a76..a48934f97 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -54,6 +54,13 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; fi done + local shortname_query_array=( unreal ) + for shortname_query in "${shortname_query_array[@]}" + do + if [ "${shortname_query}" == "${shortname}" ]; then + gamedigengine="ut" + fi + done # will bypass query if server offline check_status.sh From 558d78d0f9ff42e5ddadac0f73f3f8444d117951 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 19:14:07 +0100 Subject: [PATCH 098/395] changed port to queryport --- lgsm/functions/command_dev_query_raw.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh index ae0d539c1..2ed0742a1 100644 --- a/lgsm/functions/command_dev_query_raw.sh +++ b/lgsm/functions/command_dev_query_raw.sh @@ -29,7 +29,7 @@ elif [ "${gamename}" == "Killing Floor 2" ]; then fi query_gamedig.sh -echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --port \"${port}\"|jq" +echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --port \"${queryport}\"|jq" echo"" echo "${gamedigraw}" | jq echo"" @@ -37,7 +37,7 @@ echo "=================================" echo "gsquery Raw Output" echo "=================================" echo"" -echo "./query_gsquery.py -a \"${ip}\" -p \"${port}\" -e \"${engine}\"" +echo "./query_gsquery.py -a \"${ip}\" -p \"${queryport}\" -e \"${engine}\"" if [ ! -f "${functionsdir}/query_gsquery.py" ]; then fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5" fi From 27241023b7b5bc8b2eef5d0aba2c8cbbb1ff46fa Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 19:15:15 +0100 Subject: [PATCH 099/395] changed port to queryport changed port to queryport --- lgsm/functions/command_dev_query_raw.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh index ae0d539c1..7f3ce0105 100644 --- a/lgsm/functions/command_dev_query_raw.sh +++ b/lgsm/functions/command_dev_query_raw.sh @@ -29,7 +29,7 @@ elif [ "${gamename}" == "Killing Floor 2" ]; then fi query_gamedig.sh -echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --port \"${port}\"|jq" +echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --port \"${queryport}\"|jq" echo"" echo "${gamedigraw}" | jq echo"" @@ -37,8 +37,8 @@ echo "=================================" echo "gsquery Raw Output" echo "=================================" echo"" -echo "./query_gsquery.py -a \"${ip}\" -p \"${port}\" -e \"${engine}\"" +echo "./query_gsquery.py -a \"${ip}\" -p \"${queryport}\" -e \"${engine}\"" if [ ! -f "${functionsdir}/query_gsquery.py" ]; then fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5" fi -"${functionsdir}"/query_gsquery.py -a "${ip}" -p "${port}" -e "${engine}" \ No newline at end of file +"${functionsdir}"/query_gsquery.py -a "${ip}" -p "${queryport}" -e "${engine}" \ No newline at end of file From 12df6a884f90f06b22d280b6eaebae20ba64606e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 19:21:49 +0100 Subject: [PATCH 100/395] corrected unreal loop --- lgsm/functions/query_gamedig.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index a48934f97..443911e7a 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -54,10 +54,10 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; fi done - local shortname_query_array=( unreal ) - for shortname_query in "${shortname_query_array[@]}" + local engine_query_array=( unreal ) + for engine_query in "${engine_query_array[@]}" do - if [ "${shortname_query}" == "${shortname}" ]; then + if [ "${engine_query}" == "${engine}" ]; then gamedigengine="ut" fi done From 7929f443eb7e66feb35b5b19ab4f1af492ea5a78 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 19:31:56 +0100 Subject: [PATCH 101/395] gamedig now using --query_port so linuxgsm sets the query port --- lgsm/functions/command_dev_query_raw.sh | 2 +- lgsm/functions/query_gamedig.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh index 7f3ce0105..ad4ed7a42 100644 --- a/lgsm/functions/command_dev_query_raw.sh +++ b/lgsm/functions/command_dev_query_raw.sh @@ -29,7 +29,7 @@ elif [ "${gamename}" == "Killing Floor 2" ]; then fi query_gamedig.sh -echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --port \"${queryport}\"|jq" +echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --query_port \"${queryport}\"|jq" echo"" echo "${gamedigraw}" | jq echo"" diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 443911e7a..81b62cfac 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -66,9 +66,9 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; check_status.sh if [ "${status}" != "0" ]; then # checks if query is working 0 = pass - querystatus=$(gamedig --type "${gamedigengine}" --host "${ip}" --port "${queryport}" | jq '.error|length') + querystatus=$(gamedig --type "${gamedigengine}" --host "${ip}" --query_port "${queryport}" | jq '.error|length') # raw output - gamedigraw=$(gamedig --type "${gamedigengine}" --host "${ip}" --port "${queryport}") + gamedigraw=$(gamedig --type "${gamedigengine}" --host "${ip}" --query_port "${queryport}") # server name gdname=$(echo "${gamedigraw}" | jq -re '.name') From 84dccc2ab72126478674eda0e9a3ddc0929e9b3b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 19:40:18 +0100 Subject: [PATCH 102/395] Updated alert_discord_logo.png location --- lgsm/functions/alert_discord.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh index 2da1910ed..41aefbd1c 100644 --- a/lgsm/functions/alert_discord.sh +++ b/lgsm/functions/alert_discord.sh @@ -18,8 +18,8 @@ json=$(cat < Date: Wed, 13 Jun 2018 19:45:07 +0100 Subject: [PATCH 103/395] added removal of carriage returns --- lgsm/functions/info_config.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 72738f00d..b9ef232ff 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -736,19 +736,19 @@ fn_info_config_unreal(){ webadminuser="${unavailable}" webadminpass="${unavailable}" else - servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + servername=$(grep "ServerName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//'| sed 's/\r$//') + serverpassword=$(grep "GamePassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/GamePassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//'| sed 's/\r$//') + adminpassword=$(grep "AdminPassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//'| sed 's/\r$//') port=$(grep "Port" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' | grep "^Port" | grep -v "#" | tr -cd '[:digit:]') queryport=$((port + 1)) gsqueryport=$(grep "OldQueryPortNumber" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') - webadminenabled=$(grep "bEnabled" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminenabled=$(grep "bEnabled" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//'| sed 's/\r$//') webadminport=$(grep "ListenPort" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') if [ "${engine}" == "unreal" ]; then - webadminuser=$(grep "AdminUsername" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminUsername//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') - webadminpass=$(grep "UTServerAdmin.UTServerAdmin" "${servercfgfullpath}" -A 4 | grep "AdminPassword" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminuser=$(grep "AdminUsername" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminUsername//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//'| sed 's/\r$//') + webadminpass=$(grep "UTServerAdmin.UTServerAdmin" "${servercfgfullpath}" -A 4 | grep "AdminPassword" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminPassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//'| sed 's/\r$//') else - webadminuser=$(grep "AdminName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + webadminuser=$(grep "AdminName" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/AdminName//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//'| sed 's/\r$//') webadminpass="${adminpassword}" fi From 82ffc819da4936677caef49d4cfa78bc2ba5ebe4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 19:47:27 +0100 Subject: [PATCH 104/395] updated discord urls again --- lgsm/functions/alert_discord.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh index 41aefbd1c..4818f8721 100644 --- a/lgsm/functions/alert_discord.sh +++ b/lgsm/functions/alert_discord.sh @@ -13,13 +13,13 @@ json=$(cat < Date: Wed, 13 Jun 2018 21:27:44 +0100 Subject: [PATCH 105/395] standardized workshop variables --- .../config-lgsm/csgoserver/_default.cfg | 15 +++++++-------- .../config-lgsm/gmodserver/_default.cfg | 11 ++++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg index df0303752..6171682c2 100644 --- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg @@ -33,16 +33,15 @@ tickrate="64" # More info: https://linuxgsm.com/gslt gslt="" -## Optional: Workshop Parameters -# https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators -# To get an authkey visit - http://steamcommunity.com/dev/apikey -authkey="" -ws_collection_id="" -ws_start_map="" +## Workshop Parameters | https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators +# To get an API key visit - https://steamcommunity.com/dev/apikey +wsapikey="" +wscollectionid="" +wsstartmap="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters 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} -nobreakpad" +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 ${wscollectionid} +workshop_start_map ${wsstartmap} -authkey ${wsapikey} -nobreakpad" } #### LinuxGSM Settings #### @@ -87,7 +86,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg index e5e54e8a0..090966694 100644 --- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg @@ -18,9 +18,10 @@ maxplayers="16" tickrate="66" gamemode="sandbox" -## Workshop Parameters | http://wiki.garrysmod.com/page/Workshop_for_Dedicated_Servers -workshopauth="" -workshopcollectionid="" +## Workshop Parameters | https://wiki.garrysmod.com/page/Workshop_for_Dedicated_Servers +# To get an API key visit - https://steamcommunity.com/dev/apikey +wsapikey="" +wscollectionid="" ## Custom Start Parameters # Default +r_hunkalloclightmaps 0, fixes a start issue on maps with many lights @@ -34,7 +35,7 @@ gslt="" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters 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}" +parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} +host_workshop_collection ${wscollectionid} -authkey ${wsapikey} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} ${customparms}" } #### LinuxGSM Settings #### @@ -79,7 +80,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" From fa1c739a287925f1f84c42cc3cfadfe7d6525c56 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 21:36:05 +0100 Subject: [PATCH 106/395] Hide wsapikey on postdetails --- lgsm/functions/info_messages.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 52083921c..6f09f895d 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -1204,5 +1204,9 @@ fn_info_message_password_strip(){ if [ -n "${telnetpass}" ]; then telnetpass="********" fi + if [ -n "${wsapikey}" ]; then + wsapikey="********" + fi + fi } \ No newline at end of file From 9352e1423467d2eaf2fd7dfe3d068535280dc906 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 21:36:28 +0100 Subject: [PATCH 107/395] added code to deal with old workshop vars --- lgsm/functions/core_legacy.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lgsm/functions/core_legacy.sh b/lgsm/functions/core_legacy.sh index 41f642320..137bfe08c 100644 --- a/lgsm/functions/core_legacy.sh +++ b/lgsm/functions/core_legacy.sh @@ -39,4 +39,27 @@ fi if [ -z "${alertlog}" ]; then alertlog="${emaillog}" +fi + +# Alternations to workshop variables +if [ -z "${wsapikey}" ]; then + if [ "${workshopauth}" ]; then + wsapikey="${workshopauth}" + elif [ "${authkey}" ]; then + wsapikey="${authkey}" + fi +fi + +if [ -z "${wscollectionid}" ]; then + if [ "${workshopauth}" ]; then + wscollectionid="${ws_collection_id}" + elif [ "${authkey}" ]; then + wscollectionid="${workshopcollectionid}" + fi +fi + +if [ -z "${wsstartmap}" ]; then + if [ "${ws_start_map}" ]; then + wscollectionid="${ws_start_map}" + fi fi \ No newline at end of file From c5b508e5075d64f007d9eb430c47017ded925465 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 21:44:35 +0100 Subject: [PATCH 108/395] added gslt to hidden on post details --- lgsm/functions/info_messages.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index 6f09f895d..bb6fc00f9 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -1204,9 +1204,14 @@ fn_info_message_password_strip(){ if [ -n "${telnetpass}" ]; then telnetpass="********" fi + if [ -n "${wsapikey}" ]; then wsapikey="********" fi + if [ -n "${gslt}" ]; then + gslt="********" + fi + fi } \ No newline at end of file From 090fd1df3bf46ce24c2652bb229542a9746a3831 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 21:52:57 +0100 Subject: [PATCH 109/395] postdetails was not generating a new file. Removing any existing file --- lgsm/functions/command_postdetails.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh index 9bd635086..0ef39ce54 100644 --- a/lgsm/functions/command_postdetails.sh +++ b/lgsm/functions/command_postdetails.sh @@ -42,6 +42,11 @@ fn_bad_postdetailslog() { core_exit.sh } +# Remove any existing postdetails.log file +if [ -f "${postdetailslog}" ]; then + rm -f "${postdetailslog}" +fi + # Rather than a one-pass sed parser, default to using a temporary directory if [ -n "${alertflag}" ]; then postdetailslog="${alertlog}" From 4503decfffd40b0c69f25d528931180d152d0ab0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 13 Jun 2018 21:59:35 +0100 Subject: [PATCH 110/395] corrected " --- lgsm/functions/command_dev_clear_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_dev_clear_functions.sh b/lgsm/functions/command_dev_clear_functions.sh index bf3026c53..e7e091c64 100644 --- a/lgsm/functions/command_dev_clear_functions.sh +++ b/lgsm/functions/command_dev_clear_functions.sh @@ -9,6 +9,6 @@ echo "Clear Functions" echo "=================================" echo "" if fn_prompt_yn "Do you want to delete all functions?" Y; then - rm -rfv "${functionsdir}/*" + rm -rfv "${functionsdir}"/* fi core_exit.sh \ No newline at end of file From 0d8589863e5e861095dfe3d8509a854651d5b7ba Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Jun 2018 18:30:44 +0100 Subject: [PATCH 111/395] Added BrainBread --- .../config-lgsm/bbserver/_default.cfg | 127 ++++++++++++++++++ lgsm/data/serverlist.csv | 1 + 2 files changed, 128 insertions(+) create mode 100644 lgsm/config-default/config-lgsm/bbserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/bbserver/_default.cfg b/lgsm/config-default/config-lgsm/bbserver/_default.cfg new file mode 100644 index 000000000..03b799e19 --- /dev/null +++ b/lgsm/config-default/config-lgsm/bbserver/_default.cfg @@ -0,0 +1,127 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" +port="27015" +clientport="27005" +defaultmap="de_dust2" +maxplayers="16" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="-game bb -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" +curlcustomstring="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="90" +appidmod="cstrike" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="BrainBread" +engine="goldsource" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/cstrike" +executabledir="${serverfiles}" +executable="./hlds_run" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 397da4f75..527d53bc1 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -6,6 +6,7 @@ bf1942,bf1942server,Battlefield 1942 bd,bdserver,Base Defense bmdm,bmdmserver,Black Mesa: Deathmatch bs,bsserver,Blade Symphony +bb,bbserver,BrainBread bb2,bb2server,BrainBread 2 bt1944,bt1944server,Battalion 1944 cod,codserver,Call of Duty From 32b43340b1a35a69afb62f888463b823963c04d8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Jun 2018 18:54:16 +0100 Subject: [PATCH 112/395] updated systemdir --- lgsm/config-default/config-lgsm/bbserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/bbserver/_default.cfg b/lgsm/config-default/config-lgsm/bbserver/_default.cfg index 03b799e19..434156649 100644 --- a/lgsm/config-default/config-lgsm/bbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bbserver/_default.cfg @@ -101,7 +101,7 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${serverfiles}/cstrike" +systemdir="${serverfiles}/brainbread" executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" From b369e2c3e29f0066df397792ddf13ec81a7cd1ec Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Jun 2018 19:29:35 +0100 Subject: [PATCH 113/395] updated parms --- lgsm/config-default/config-lgsm/bbserver/_default.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/bbserver/_default.cfg b/lgsm/config-default/config-lgsm/bbserver/_default.cfg index 434156649..32445f743 100644 --- a/lgsm/config-default/config-lgsm/bbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bbserver/_default.cfg @@ -12,12 +12,12 @@ ip="0.0.0.0" port="27015" clientport="27005" -defaultmap="de_dust2" +defaultmap="bb_chp4_slaywatch" maxplayers="16" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="-game bb -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +parms="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } #### LinuxGSM Settings #### From 99e8dfb1e7b7d8253f347fcb8643a06e13606a19 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Jun 2018 21:58:38 +0100 Subject: [PATCH 114/395] Added BrainBread download link --- lgsm/functions/install_server_files.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 63e2f48d1..b7d58626a 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -11,6 +11,8 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_install_server_files(){ if [ "${gamename}" == "Battlefield: 1942" ]; then remote_fileurl="http://files.linuxgsm.com/BattleField1942/bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="bf1942_lnxded-1.61-hacked-to-1.612.full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="a86a5d3cd64ca59abcc9bb9f777c2e5d" + elif [ "${gamename}" == "BrainBread" ]; then + remote_fileurl="https://files.linuxgsm.com/BrainBread/brainbread-v1.2-linuxserver.tar.bz2"; local_filedir="${tmpdir}"; local_filename="brainbread-v1.2-linuxserver.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="5c729a7e9eecfa81b71a6a1f7267f0fd" elif [ "${gamename}" == "Call of Duty" ]; then remote_fileurl="http://files.linuxgsm.com/CallOfDuty/cod-lnxded-1.5b-full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="cod-lnxded-1.5-large.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="19629895a4cf6fd8f6d1ee198b5304cd" elif [ "${gamename}" == "Call of Duty: United Offensive" ]; then From f3a9f524fd16743ef16cdc1716c6c4cf4aa1c744 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Jun 2018 22:04:19 +0100 Subject: [PATCH 115/395] Added BrainBread --- 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 b7d58626a..19c625203 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -140,7 +140,7 @@ elif [ "${gamename}" == "Multi Theft Auto" ]; then elif [ "${gamename}" == "Factorio" ]; then update_factorio.sh install_factorio_save.sh -elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]; then +elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]; then if [ "${gamename}" == "Unreal Tournament" ]; then install_unreal_tournament_eula.sh fi From b25a43b28e8924977ff934c7aa52c071b564ef4d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 15 Jun 2018 22:24:29 +0100 Subject: [PATCH 116/395] Added BrainBread --- lgsm/functions/install_config.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 53df4a316..1461ce1bb 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -181,6 +181,12 @@ elif [ "${gamename}" == "Blade Symphony" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "BrainBread" ]; then + gamedirname="BrainBread" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "BrainBread 2" ]; then gamedirname="BrainBread2" array_configs+=( server.cfg ) From 0050ca58c3c79c6e204845fcd18ad7798d66f040 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 00:18:59 +0100 Subject: [PATCH 117/395] Added no-response bot --- .github/no-response.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/no-response.yml diff --git a/.github/no-response.yml b/.github/no-response.yml new file mode 100644 index 000000000..cfad0d38b --- /dev/null +++ b/.github/no-response.yml @@ -0,0 +1,13 @@ +# Configuration for probot-no-response - https://github.com/probot/no-response + +# Number of days of inactivity before an Issue is closed for lack of response +daysUntilClose: 30 +# Label requiring a response +responseRequiredLabel: Status: waiting response +# Comment to post when closing an Issue for lack of response. Set to `false` to disable +closeComment: > + This issue has been automatically closed because there has been no response + to our request for more information from the original author. With only the + information that is currently in the issue, we don't have enough information + to take action. Please reach out if you have or find the answers we need so + that we can investigate further. \ No newline at end of file From 40548cc03a7f3dc1dc457083aca275093bc944d3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 00:19:32 +0100 Subject: [PATCH 118/395] changed support message label to Outcome: wrong forum --- .github/support.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/support.yml b/.github/support.yml index 01cde2963..2f45e92ec 100644 --- a/.github/support.yml +++ b/.github/support.yml @@ -1,14 +1,14 @@ # Configuration for support-requests - https://github.com/dessant/support-requests # Label used to mark issues as support requests -supportLabel: "Type: support" +supportLabel: "Outcome: wrong forum" # Comment to post on issues marked as support requests. Add a link # to a support page, or set to `false` to disable supportComment: > We use the issue tracker exclusively for bug reports and feature requests. However, this issue appears to be a support request. Please use our support channels to get help with the project. - https://linuxgsm.com/support/ + https://linuxgsm.com/support # Whether to close issues marked as support requests close: true # Whether to lock issues marked as support requests From 5758810930bba8fcdddd941e5525a8eab52cd949 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 00:19:38 +0100 Subject: [PATCH 119/395] quotes --- .github/request-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/request-info.yml b/.github/request-info.yml index a1441d5cc..daae9d2cf 100644 --- a/.github/request-info.yml +++ b/.github/request-info.yml @@ -12,4 +12,4 @@ requestInfoReplyComment: > # - updates # *OPTIONAL* Label to be added to Issues and Pull Requests with insufficient information given -requestInfoLabelToAdd: Status: needs more info \ No newline at end of file +requestInfoLabelToAdd: "Status: needs more info" \ No newline at end of file From 529685a495686995cd5c66f0dde17b016ea088d5 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 00:58:02 +0100 Subject: [PATCH 120/395] Issues will now lock if over 1 year old --- .github/lock.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/lock.yml diff --git a/.github/lock.yml b/.github/lock.yml new file mode 100644 index 000000000..2501c129a --- /dev/null +++ b/.github/lock.yml @@ -0,0 +1,28 @@ +# Configuration for lock-threads - https://github.com/dessant/lock-threads + +# Number of days of inactivity before a closed issue or pull request is locked +daysUntilLock: 365 + +# Issues and pull requests with these labels will not be locked. Set to `[]` to disable +exemptLabels: [] + +# Label to add before locking, such as `outdated`. Set to `false` to disable +lockLabel: false + +# Comment to post before locking. Set to `false` to disable +lockComment: > + This thread has been automatically locked since there has not been + any recent activity after it was closed. Please open a new issue for + related bugs. + +# Limit to only `issues` or `pulls` +# only: issues + +# Optionally, specify configuration settings just for `issues` or `pulls` +# issues: +# exemptLabels: +# - help-wanted +# lockLabel: outdated + +# pulls: +# daysUntilLock: 30 \ No newline at end of file From f48d2d03f340cf0b629fb2f6923456c4a19a98ee Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 00:58:23 +0100 Subject: [PATCH 121/395] Bot will label a potential duplicate issue --- .github/potential-duplicates.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/potential-duplicates.yml diff --git a/.github/potential-duplicates.yml b/.github/potential-duplicates.yml new file mode 100644 index 000000000..ef31c01dc --- /dev/null +++ b/.github/potential-duplicates.yml @@ -0,0 +1,13 @@ +# Label name and color to set, when potential duplicates are detected +issueLabel: "Type: potential duplicate" +labelColor: D2DAE1 + +# If similarity is higher than this threshold, issue will be marked as duplicate +threshold: 0.60 + +# Comment to post when potential duplicates are detected +referenceComment: > + Potential duplicates: + {{#issues}} + - [#{{ number }}] {{ title }} ({{ accuracy }}%) + {{/issues}} \ No newline at end of file From a6c7c3152441e34db9c24946c9c82d9e66c063e3 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 11:46:36 +0100 Subject: [PATCH 122/395] Added Natural Selection --- lgsm/data/serverlist.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 527d53bc1..e88f39edc 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -45,8 +45,9 @@ l4d2,l4d2server,Left 4 Dead 2 mc,mcserver,Minecraft mta,mtaserver,Multi Theft Auto mumble,mumbleserver,Mumble -ns2,ns2server,Natural Selection 2 nmrih,nmrihserver,No More Room in Hell +ns,nsserver,Natural Selection +ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force pvkii,pvkiiserver,Pirates Vikings & Knights II From d77f18bb873f67932087bb737a724273aaf9b000 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 11:48:20 +0100 Subject: [PATCH 123/395] Added nsserver --- .../config-lgsm/nsserver/_default.cfg | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 lgsm/config-default/config-lgsm/nsserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/nsserver/_default.cfg b/lgsm/config-default/config-lgsm/nsserver/_default.cfg new file mode 100644 index 000000000..bfdcfcf02 --- /dev/null +++ b/lgsm/config-default/config-lgsm/nsserver/_default.cfg @@ -0,0 +1,127 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" +port="27015" +clientport="27005" +defaultmap="bb_chp4_slaywatch" +maxplayers="16" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" +curlcustomstring="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="90" +appidmod="cstrike" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="Natural Selection" +engine="goldsource" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/brainbread" +executabledir="${serverfiles}" +executable="./hlds_run" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 21161a93947b0c8a7da1fb49eacff0e5705a3905 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 12:31:39 +0100 Subject: [PATCH 124/395] Updated ns config details --- lgsm/config-default/config-lgsm/nsserver/_default.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/config-default/config-lgsm/nsserver/_default.cfg b/lgsm/config-default/config-lgsm/nsserver/_default.cfg index bfdcfcf02..24549021b 100644 --- a/lgsm/config-default/config-lgsm/nsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nsserver/_default.cfg @@ -12,12 +12,12 @@ ip="0.0.0.0" port="27015" clientport="27005" -defaultmap="bb_chp4_slaywatch" +defaultmap="ns_hera" maxplayers="16" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +parms="-game ns -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } #### LinuxGSM Settings #### @@ -101,7 +101,7 @@ engine="goldsource" # Edit with care ## Server Specific Directories -systemdir="${serverfiles}/brainbread" +systemdir="${serverfiles}/ns" executabledir="${serverfiles}" executable="./hlds_run" servercfg="${servicename}.cfg" From 8b9bbe2aa2c7b14044c2c43066a6c9abcee1d49a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 12:48:31 +0100 Subject: [PATCH 125/395] Added Natural Selection --- lgsm/functions/install_config.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 1461ce1bb..2223ae458 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -404,6 +404,12 @@ elif [ "${gamename}" == "Minecraft" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "Natural Selection" ]; then + gamedirname="NaturalSelection" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "No More Room in Hell" ]; then gamedirname="NoMoreRoominHell" array_configs+=( server.cfg ) From c831cda0c23aa1a8781e7e5ca3aa379c2771d2ce Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 12:52:49 +0100 Subject: [PATCH 126/395] added Natural Selection server files --- lgsm/functions/install_server_files.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 19c625203..269fd8748 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -27,6 +27,8 @@ fn_install_server_files(){ remote_fileurl="http://files.linuxgsm.com/WolfensteinEnemyTerritory/etlegacy-v2.75-i386-et-260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.75-i386-et-260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="92d7d4c26e0a295daed78cef623eeabb" elif [ "${gamename}" == "GoldenEye: Source" ]; then remote_fileurl="http://files.linuxgsm.com/GoldenEyeSource/GoldenEye_Source_v5.0.6_full_server.tar.bz2"; local_filedir="${tmpdir}"; local_filename="GoldenEye_Source_v5.0.6_full_server.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="c45c16293096706e8b5e2cd64a6f2931" + elif [ "${gamename}" == "Natural Selection" ]; then + remote_fileurl="http://files.linuxgsm.com/NaturalSelection/ns_dedicated_server_v32.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ns_dedicated_server_v32.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="499cf63324b76925ada6baf5f2eacd67" elif [ "${gamename}" == "Quake 2" ]; then remote_fileurl="http://files.linuxgsm.com/Quake2/quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; local_filedir="${tmpdir}"; local_filename="quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="0b8c7e2d51f40b56b328c69e986e7c5f" elif [ "${gamename}" == "Quake 3: Arena" ]; then @@ -140,7 +142,7 @@ elif [ "${gamename}" == "Multi Theft Auto" ]; then elif [ "${gamename}" == "Factorio" ]; then update_factorio.sh install_factorio_save.sh -elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]; then +elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]||[ "${shortname}" == "ns" ]; then if [ "${gamename}" == "Unreal Tournament" ]; then install_unreal_tournament_eula.sh fi From e751458224d3b9452677769effedbf2b3ac07a8b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 13:04:27 +0100 Subject: [PATCH 127/395] Added Natural Selection Added new server Natural Selection --- .github/lock.yml | 28 ++++ .github/no-response.yml | 13 ++ .github/potential-duplicates.yml | 13 ++ .github/request-info.yml | 2 +- .github/support.yml | 4 +- .../config-lgsm/nsserver/_default.cfg | 127 ++++++++++++++++++ lgsm/data/serverlist.csv | 3 +- lgsm/functions/install_config.sh | 6 + lgsm/functions/install_server_files.sh | 4 +- 9 files changed, 195 insertions(+), 5 deletions(-) create mode 100644 .github/lock.yml create mode 100644 .github/no-response.yml create mode 100644 .github/potential-duplicates.yml create mode 100644 lgsm/config-default/config-lgsm/nsserver/_default.cfg diff --git a/.github/lock.yml b/.github/lock.yml new file mode 100644 index 000000000..2501c129a --- /dev/null +++ b/.github/lock.yml @@ -0,0 +1,28 @@ +# Configuration for lock-threads - https://github.com/dessant/lock-threads + +# Number of days of inactivity before a closed issue or pull request is locked +daysUntilLock: 365 + +# Issues and pull requests with these labels will not be locked. Set to `[]` to disable +exemptLabels: [] + +# Label to add before locking, such as `outdated`. Set to `false` to disable +lockLabel: false + +# Comment to post before locking. Set to `false` to disable +lockComment: > + This thread has been automatically locked since there has not been + any recent activity after it was closed. Please open a new issue for + related bugs. + +# Limit to only `issues` or `pulls` +# only: issues + +# Optionally, specify configuration settings just for `issues` or `pulls` +# issues: +# exemptLabels: +# - help-wanted +# lockLabel: outdated + +# pulls: +# daysUntilLock: 30 \ No newline at end of file diff --git a/.github/no-response.yml b/.github/no-response.yml new file mode 100644 index 000000000..cfad0d38b --- /dev/null +++ b/.github/no-response.yml @@ -0,0 +1,13 @@ +# Configuration for probot-no-response - https://github.com/probot/no-response + +# Number of days of inactivity before an Issue is closed for lack of response +daysUntilClose: 30 +# Label requiring a response +responseRequiredLabel: Status: waiting response +# Comment to post when closing an Issue for lack of response. Set to `false` to disable +closeComment: > + This issue has been automatically closed because there has been no response + to our request for more information from the original author. With only the + information that is currently in the issue, we don't have enough information + to take action. Please reach out if you have or find the answers we need so + that we can investigate further. \ No newline at end of file diff --git a/.github/potential-duplicates.yml b/.github/potential-duplicates.yml new file mode 100644 index 000000000..ef31c01dc --- /dev/null +++ b/.github/potential-duplicates.yml @@ -0,0 +1,13 @@ +# Label name and color to set, when potential duplicates are detected +issueLabel: "Type: potential duplicate" +labelColor: D2DAE1 + +# If similarity is higher than this threshold, issue will be marked as duplicate +threshold: 0.60 + +# Comment to post when potential duplicates are detected +referenceComment: > + Potential duplicates: + {{#issues}} + - [#{{ number }}] {{ title }} ({{ accuracy }}%) + {{/issues}} \ No newline at end of file diff --git a/.github/request-info.yml b/.github/request-info.yml index a1441d5cc..daae9d2cf 100644 --- a/.github/request-info.yml +++ b/.github/request-info.yml @@ -12,4 +12,4 @@ requestInfoReplyComment: > # - updates # *OPTIONAL* Label to be added to Issues and Pull Requests with insufficient information given -requestInfoLabelToAdd: Status: needs more info \ No newline at end of file +requestInfoLabelToAdd: "Status: needs more info" \ No newline at end of file diff --git a/.github/support.yml b/.github/support.yml index 01cde2963..2f45e92ec 100644 --- a/.github/support.yml +++ b/.github/support.yml @@ -1,14 +1,14 @@ # Configuration for support-requests - https://github.com/dessant/support-requests # Label used to mark issues as support requests -supportLabel: "Type: support" +supportLabel: "Outcome: wrong forum" # Comment to post on issues marked as support requests. Add a link # to a support page, or set to `false` to disable supportComment: > We use the issue tracker exclusively for bug reports and feature requests. However, this issue appears to be a support request. Please use our support channels to get help with the project. - https://linuxgsm.com/support/ + https://linuxgsm.com/support # Whether to close issues marked as support requests close: true # Whether to lock issues marked as support requests diff --git a/lgsm/config-default/config-lgsm/nsserver/_default.cfg b/lgsm/config-default/config-lgsm/nsserver/_default.cfg new file mode 100644 index 000000000..24549021b --- /dev/null +++ b/lgsm/config-default/config-lgsm/nsserver/_default.cfg @@ -0,0 +1,127 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" +port="27015" +clientport="27005" +defaultmap="ns_hera" +maxplayers="16" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="-game ns -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" +curlcustomstring="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="90" +appidmod="cstrike" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="Natural Selection" +engine="goldsource" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/ns" +executabledir="${serverfiles}" +executable="./hlds_run" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 527d53bc1..e88f39edc 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -45,8 +45,9 @@ l4d2,l4d2server,Left 4 Dead 2 mc,mcserver,Minecraft mta,mtaserver,Multi Theft Auto mumble,mumbleserver,Mumble -ns2,ns2server,Natural Selection 2 nmrih,nmrihserver,No More Room in Hell +ns,nsserver,Natural Selection +ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force pvkii,pvkiiserver,Pirates Vikings & Knights II diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 1461ce1bb..2223ae458 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -404,6 +404,12 @@ elif [ "${gamename}" == "Minecraft" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "Natural Selection" ]; then + gamedirname="NaturalSelection" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "No More Room in Hell" ]; then gamedirname="NoMoreRoominHell" array_configs+=( server.cfg ) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 19c625203..269fd8748 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -27,6 +27,8 @@ fn_install_server_files(){ remote_fileurl="http://files.linuxgsm.com/WolfensteinEnemyTerritory/etlegacy-v2.75-i386-et-260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="etlegacy-v2.75-i386-et-260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="92d7d4c26e0a295daed78cef623eeabb" elif [ "${gamename}" == "GoldenEye: Source" ]; then remote_fileurl="http://files.linuxgsm.com/GoldenEyeSource/GoldenEye_Source_v5.0.6_full_server.tar.bz2"; local_filedir="${tmpdir}"; local_filename="GoldenEye_Source_v5.0.6_full_server.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="c45c16293096706e8b5e2cd64a6f2931" + elif [ "${gamename}" == "Natural Selection" ]; then + remote_fileurl="http://files.linuxgsm.com/NaturalSelection/ns_dedicated_server_v32.tar.bz2"; local_filedir="${tmpdir}"; local_filename="ns_dedicated_server_v32.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="499cf63324b76925ada6baf5f2eacd67" elif [ "${gamename}" == "Quake 2" ]; then remote_fileurl="http://files.linuxgsm.com/Quake2/quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; local_filedir="${tmpdir}"; local_filename="quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="0b8c7e2d51f40b56b328c69e986e7c5f" elif [ "${gamename}" == "Quake 3: Arena" ]; then @@ -140,7 +142,7 @@ elif [ "${gamename}" == "Multi Theft Auto" ]; then elif [ "${gamename}" == "Factorio" ]; then update_factorio.sh install_factorio_save.sh -elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]; then +elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]||[ "${shortname}" == "ns" ]; then if [ "${gamename}" == "Unreal Tournament" ]; then install_unreal_tournament_eula.sh fi From 7ba61bd247840968c6426297df517bd31576d078 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 13:08:49 +0100 Subject: [PATCH 128/395] Added Vampire Slayer --- lgsm/data/serverlist.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index e88f39edc..6f0a9efcb 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -76,6 +76,7 @@ tu,tuserver,Tower Unite ut2k4,ut2k4server,Unreal Tournament 2004 ut3,ut3server,Unreal Tournament 3 ut99,ut99server,Unreal Tournament 99 +vs,vsserver,Vampire Slayer wet,wetserver,Wolfenstein: Enemy Territory etl,etlserver,ET: Legacy zps,zpsserver,Zombie Panic! Source From fb341bac52128e1f5c2ad9119deb4ba1fabbe5fb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 13:11:06 +0100 Subject: [PATCH 129/395] Added Vampire Slayer --- .../config-lgsm/vsserver/_default.cfg | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 lgsm/config-default/config-lgsm/vsserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/vsserver/_default.cfg b/lgsm/config-default/config-lgsm/vsserver/_default.cfg new file mode 100644 index 000000000..7fbfabfe6 --- /dev/null +++ b/lgsm/config-default/config-lgsm/vsserver/_default.cfg @@ -0,0 +1,127 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" +port="27015" +clientport="27005" +defaultmap="bb_chp4_slaywatch" +maxplayers="16" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" +curlcustomstring="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="90" +appidmod="cstrike" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="Vampire Slayer" +engine="goldsource" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/vs" +executabledir="${serverfiles}" +executable="./hlds_run" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" From 47b5742a10ff851891d4d254b933b211c8f8511b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 13:37:50 +0100 Subject: [PATCH 130/395] updated game --- lgsm/config-default/config-lgsm/vsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/vsserver/_default.cfg b/lgsm/config-default/config-lgsm/vsserver/_default.cfg index 7fbfabfe6..71d6c4740 100644 --- a/lgsm/config-default/config-lgsm/vsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vsserver/_default.cfg @@ -17,7 +17,7 @@ maxplayers="16" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="-game brainbread -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +parms="-game vs -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" } #### LinuxGSM Settings #### From f5833b732ee1fa560da458d08ec25d32249fc38a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 13:41:05 +0100 Subject: [PATCH 131/395] updated defaulmap --- lgsm/config-default/config-lgsm/vsserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/vsserver/_default.cfg b/lgsm/config-default/config-lgsm/vsserver/_default.cfg index 71d6c4740..35f0c28b6 100644 --- a/lgsm/config-default/config-lgsm/vsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vsserver/_default.cfg @@ -12,7 +12,7 @@ ip="0.0.0.0" port="27015" clientport="27005" -defaultmap="bb_chp4_slaywatch" +defaultmap="vs_frost" maxplayers="16" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters From 5723bd300681af3d01199c5893e463464c06e55a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 13:45:01 +0100 Subject: [PATCH 132/395] Added Vampire Slayer --- lgsm/functions/install_config.sh | 6 ++++++ lgsm/functions/install_server_files.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 2223ae458..28f8a954d 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -572,6 +572,12 @@ elif [ "${gamename}" == "Unreal Tournament 99" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "Vampire Slayer" ]; then + gamedirname="VampireSlayer" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then gamedirname="WolfensteinEnemyTerritory" array_configs+=( server.cfg ) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 269fd8748..0cfeaf2ca 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -142,7 +142,7 @@ elif [ "${gamename}" == "Multi Theft Auto" ]; then elif [ "${gamename}" == "Factorio" ]; then update_factorio.sh install_factorio_save.sh -elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]||[ "${shortname}" == "ns" ]; then +elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]||[ "${shortname}" == "ns" ]||[ "${shortname}" == "vs" ]; then if [ "${gamename}" == "Unreal Tournament" ]; then install_unreal_tournament_eula.sh fi From d20c135fa92d87d00dc91fec858b05d76b8e2632 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 14:24:59 +0100 Subject: [PATCH 133/395] Added Vampire Slayer server files --- lgsm/functions/install_server_files.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 0cfeaf2ca..f2ad8c20f 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -43,6 +43,8 @@ fn_install_server_files(){ remote_fileurl="https://s3.amazonaws.com/unrealtournament/UnrealTournament-Client-XAN-3395761-Linux.zip"; local_filedir="${tmpdir}"; local_filename="UnrealTournament-Server-XAN-3395761-Linux.zip"; chmodx="noexecute" run="norun"; force="noforce"; md5="f04ad5b96865b19613303331ff4075eb" elif [ "${gamename}" == "Unreal Tournament 3" ]; then remote_fileurl="http://files.linuxgsm.com/UnrealTournament3/UT3-linux-server-2.1.tar.bz2"; local_filedir="${tmpdir}"; local_filename="UT3-linux-server-2.1.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2527437b46f1b47f20228d27d72395a6" + elif [ "${gamename}" == "Vampire Slayer" ]; then + remote_fileurl="https://files.linuxgsm.com/VampireSlayer/vs_l-6.0_full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="vs_l-6.0_full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="38a79e44b98578bbdc5b15818493a066" elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then remote_fileurl="http://files.linuxgsm.com/WolfensteinEnemyTerritory/enemy-territory.260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="enemy-territory.260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="f833f514bfcdd46b42c111f83350c5a7" elif [ "${gamename}" == "San Andreas Multiplayer" ]; then From 63e09973ee1f9f81273c40c16f31e62a3bab07ae Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 15:00:08 +0100 Subject: [PATCH 134/395] Added Vampire Slayer --- .../config-lgsm/vsserver/_default.cfg | 127 ++++++++++++++++++ lgsm/data/serverlist.csv | 1 + lgsm/functions/install_config.sh | 6 + lgsm/functions/install_server_files.sh | 4 +- 4 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 lgsm/config-default/config-lgsm/vsserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/vsserver/_default.cfg b/lgsm/config-default/config-lgsm/vsserver/_default.cfg new file mode 100644 index 000000000..35f0c28b6 --- /dev/null +++ b/lgsm/config-default/config-lgsm/vsserver/_default.cfg @@ -0,0 +1,127 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters +ip="0.0.0.0" +port="27015" +clientport="27005" +defaultmap="vs_frost" +maxplayers="16" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="-game vs -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" +curlcustomstring="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="90" +appidmod="cstrike" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="Vampire Slayer" +engine="goldsource" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/vs" +executabledir="${serverfiles}" +executable="./hlds_run" +servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" +servercfgdir="${systemdir}" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${rootdir}/backups" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index e88f39edc..6f0a9efcb 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -76,6 +76,7 @@ tu,tuserver,Tower Unite ut2k4,ut2k4server,Unreal Tournament 2004 ut3,ut3server,Unreal Tournament 3 ut99,ut99server,Unreal Tournament 99 +vs,vsserver,Vampire Slayer wet,wetserver,Wolfenstein: Enemy Territory etl,etlserver,ET: Legacy zps,zpsserver,Zombie Panic! Source diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 2223ae458..28f8a954d 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -572,6 +572,12 @@ elif [ "${gamename}" == "Unreal Tournament 99" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "Vampire Slayer" ]; then + gamedirname="VampireSlayer" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then gamedirname="WolfensteinEnemyTerritory" array_configs+=( server.cfg ) diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 269fd8748..f2ad8c20f 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -43,6 +43,8 @@ fn_install_server_files(){ remote_fileurl="https://s3.amazonaws.com/unrealtournament/UnrealTournament-Client-XAN-3395761-Linux.zip"; local_filedir="${tmpdir}"; local_filename="UnrealTournament-Server-XAN-3395761-Linux.zip"; chmodx="noexecute" run="norun"; force="noforce"; md5="f04ad5b96865b19613303331ff4075eb" elif [ "${gamename}" == "Unreal Tournament 3" ]; then remote_fileurl="http://files.linuxgsm.com/UnrealTournament3/UT3-linux-server-2.1.tar.bz2"; local_filedir="${tmpdir}"; local_filename="UT3-linux-server-2.1.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="2527437b46f1b47f20228d27d72395a6" + elif [ "${gamename}" == "Vampire Slayer" ]; then + remote_fileurl="https://files.linuxgsm.com/VampireSlayer/vs_l-6.0_full.tar.bz2"; local_filedir="${tmpdir}"; local_filename="vs_l-6.0_full.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="38a79e44b98578bbdc5b15818493a066" elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then remote_fileurl="http://files.linuxgsm.com/WolfensteinEnemyTerritory/enemy-territory.260b.tar.bz2"; local_filedir="${tmpdir}"; local_filename="enemy-territory.260b.tar.bz2"; chmodx="nochmodx" run="norun"; force="noforce"; md5="f833f514bfcdd46b42c111f83350c5a7" elif [ "${gamename}" == "San Andreas Multiplayer" ]; then @@ -142,7 +144,7 @@ elif [ "${gamename}" == "Multi Theft Auto" ]; then elif [ "${gamename}" == "Factorio" ]; then update_factorio.sh install_factorio_save.sh -elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]||[ "${shortname}" == "ns" ]; then +elif [ -z "${appid}" ]||[ "${gamename}" == "GoldenEye: Source" ]||[ "${gamename}" == "Base Defense" ]||[ "${gamename}" == "BrainBread" ]||[ "${shortname}" == "ns" ]||[ "${shortname}" == "vs" ]; then if [ "${gamename}" == "Unreal Tournament" ]; then install_unreal_tournament_eula.sh fi From eeffab7265351e69bd4bd158fa5f62ec00c7b7df Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 15:06:42 +0100 Subject: [PATCH 135/395] Possible fix for #1861 GoldSrc servers not installing properly --- lgsm/functions/command_validate.sh | 2 +- lgsm/functions/install_server_files.sh | 6 +++--- lgsm/functions/update_steamcmd.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 34d48ca28..78fd28f38 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -26,7 +26,7 @@ fn_validation(){ fi if [ "${engine}" == "goldsource" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +app_update "${appid}" ${branch} validate +quit | tee -a "${lgsmlog}" + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +app_update "${appid}" ${branch} validate +quit | tee -a "${lgsmlog}" else ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} validate +quit | tee -a "${lgsmlog}" fi diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index f2ad8c20f..31a2ece03 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -88,7 +88,7 @@ fn_install_server_files_steamcmd(){ if [ "${counter}" -le "4" ]; then if [ "${engine}" == "goldsource" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit local exitcode=$? else ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} +quit @@ -96,7 +96,7 @@ fn_install_server_files_steamcmd(){ fi elif [ "${counter}" -ge "5" ]; then if [ "${engine}" == "goldsource" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} validate +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} validate +quit local exitcode=$? else ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} validate +quit @@ -117,7 +117,7 @@ fn_install_server_files_steamcmd(){ counter="0" while [ "${counter}" -le "4" ]; do counter=$((counter+1)) - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} -validate +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} validate +quit local exitcode=$? done fi diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 3a068be18..b60adbc53 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -27,7 +27,7 @@ fn_update_steamcmd_dl(){ cd "${steamcmddir}" || exit if [ "${engine}" == "goldsource" ]; then - ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit | tee -a "${lgsmlog}" + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit | tee -a "${lgsmlog}" else ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" ${branch} +quit | tee -a "${lgsmlog}" if [ "${gamename}" == "Classic Offensive" ]; then From ced94070008633d2643084f6e45f391eace83ce0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 15:38:40 +0100 Subject: [PATCH 136/395] updated no-response message --- .github/no-response.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/no-response.yml b/.github/no-response.yml index cfad0d38b..6f799e03f 100644 --- a/.github/no-response.yml +++ b/.github/no-response.yml @@ -7,7 +7,4 @@ responseRequiredLabel: Status: waiting response # Comment to post when closing an Issue for lack of response. Set to `false` to disable closeComment: > This issue has been automatically closed because there has been no response - to our request for more information from the original author. With only the - information that is currently in the issue, we don't have enough information - to take action. Please reach out if you have or find the answers we need so - that we can investigate further. \ No newline at end of file + to this issue and is now stale. \ No newline at end of file From 22aefa650c6927412ac1498113c866588032af71 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 15:43:50 +0100 Subject: [PATCH 137/395] tidy --- 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 b998f8ed1..ef86fb396 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -135,7 +135,7 @@ fn_found_missing_deps(){ sleep 0.5 if [ -n monocheck ]; then fn_add_mono_repo - fi + fi sleep 0.5 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then From f3f977b604c223476089305c7a8a8727bf27c19a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 15:45:47 +0100 Subject: [PATCH 138/395] added quotes --- .github/no-response.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/no-response.yml b/.github/no-response.yml index 6f799e03f..4769c5db3 100644 --- a/.github/no-response.yml +++ b/.github/no-response.yml @@ -3,7 +3,7 @@ # Number of days of inactivity before an Issue is closed for lack of response daysUntilClose: 30 # Label requiring a response -responseRequiredLabel: Status: waiting response +responseRequiredLabel: "Status: waiting response" # Comment to post when closing an Issue for lack of response. Set to `false` to disable closeComment: > This issue has been automatically closed because there has been no response From 514ec0e686dfb0b2e80880e05c6f9f3b6d20b24e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 17:03:20 +0100 Subject: [PATCH 139/395] clear-functions now removes the _default.cfg --- lgsm/functions/command_dev_clear_functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/command_dev_clear_functions.sh b/lgsm/functions/command_dev_clear_functions.sh index e7e091c64..40f781d72 100644 --- a/lgsm/functions/command_dev_clear_functions.sh +++ b/lgsm/functions/command_dev_clear_functions.sh @@ -10,5 +10,6 @@ echo "=================================" echo "" if fn_prompt_yn "Do you want to delete all functions?" Y; then rm -rfv "${functionsdir}"/* + rm -rfv "${configdirdefault}"/* fi core_exit.sh \ No newline at end of file From ed7b6d5cebd9a61a55ac29a5c765824ac2d8ab7b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 17:12:26 +0100 Subject: [PATCH 140/395] Added Glibc Not required --- lgsm/functions/command_dev_detect_glibc.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh index e76213cb1..5ba859aa1 100644 --- a/lgsm/functions/command_dev_detect_glibc.sh +++ b/lgsm/functions/command_dev_detect_glibc.sh @@ -43,11 +43,14 @@ while IFS= read -r -d $'\0' line; do echo -n "${i} / ${files}" $'\r' ((i++)) done -echo "" -cat "${tmpdir}/detect_glibc_files.tmp" -echo "" -cat "${tmpdir}/detect_glibc.tmp" | sort | uniq | sort -r --version-sort -rm "${tmpdir}/detect_glibc.tmp" -rm "${tmpdir}/detect_glibc_files.tmp" - +if [ -f "${tmpdir}/detect_glibc_files.tmp" ]; then + echo "" + cat "${tmpdir}/detect_glibc_files.tmp" + echo "" + cat "${tmpdir}/detect_glibc.tmp" | sort | uniq | sort -r --version-sort + rm "${tmpdir}/detect_glibc.tmp" + rm "${tmpdir}/detect_glibc_files.tmp" +else + fn_print_information_nl "GLIBC is not required" +fi core_exit.sh From 3d753fb9e1c0c67a8b0ae414e07f074343f2accc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 17:49:40 +0100 Subject: [PATCH 141/395] Detect GLIBC now checks SteamCMD requirements --- lgsm/functions/command_dev_detect_glibc.sh | 65 +++++++++++++++------- 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh index 5ba859aa1..2c8be6c42 100644 --- a/lgsm/functions/command_dev_detect_glibc.sh +++ b/lgsm/functions/command_dev_detect_glibc.sh @@ -32,25 +32,52 @@ elif [ -f "${serverfiles}" ]; then fi echo "" -files=$(find "${serverfiles}" | wc -l) -find "${serverfiles}" -type f -print0 | -while IFS= read -r -d $'\0' line; do - glibcversion=$(objdump -T "${line}" 2>/dev/null | grep -oP "GLIBC[^ ]+" | grep -v GLIBCXX | sort | uniq | sort -r --version-sort | head -n 1) - if [ "${glibcversion}" ]; then - echo "${glibcversion}: ${line}" >>"${tmpdir}/detect_glibc_files.tmp" + +local glibc_check_dir_array=( steamcmddir serverfiles ) +for glibc_check_var in "${glibc_check_dir_array[@]}" +do + if [ "${glibc_check_var}" == "serverfiles" ]; then + glibc_check_dir="${serverfiles}" + glibc_check_name="${gamename}" + elif [ "${glibc_check_var}" == "steamcmddir" ]; then + glibc_check_dir="${steamcmddir}" + glibc_check_name="SteamCMD" + fi + + if [ -d "${glibc_check_dir}" ]; then + glibc_check_files=$(find "${glibc_check_dir}" | wc -l) + find "${glibc_check_dir}" -type f -print0 | + while IFS= read -r -d $'\0' line; do + glibcversion=$(objdump -T "${line}" 2>/dev/null | grep -oP "GLIBC[^ ]+" | grep -v GLIBCXX | sort | uniq | sort -r --version-sort | head -n 1) + if [ "${glibcversion}" ]; then + echo "${glibcversion}: ${line}" >>"${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" + fi + objdump -T "${line}" 2>/dev/null | grep -oP "GLIBC[^ ]+" >>"${tmpdir}/detect_glibc_${glibc_check_var}.tmp" + echo -n "${i} / ${glibc_check_files}" $'\r' + ((i++)) + done + if [ -f "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" ]; then + echo "" + echo "" + echo "${glibc_check_name} GLIBC Requirements" + echo "=================================" + echo "Required GLIBC" + cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | head -1 + echo "" + echo "Files requiring GLIBC" + echo "" + echo "Highest verion required: filename" + cat "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" + echo "" + echo "All required GLIBC versions" + cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort + rm "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" + rm "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" + else + fn_print_information_nl "GLIBC is not required" + fi + else + fn_print_information_nl "${glibc_check_name} is not installed" fi - objdump -T "${line}" 2>/dev/null | grep -oP "GLIBC[^ ]+" >>"${tmpdir}/detect_glibc.tmp" - echo -n "${i} / ${files}" $'\r' - ((i++)) done -if [ -f "${tmpdir}/detect_glibc_files.tmp" ]; then - echo "" - cat "${tmpdir}/detect_glibc_files.tmp" - echo "" - cat "${tmpdir}/detect_glibc.tmp" | sort | uniq | sort -r --version-sort - rm "${tmpdir}/detect_glibc.tmp" - rm "${tmpdir}/detect_glibc_files.tmp" -else - fn_print_information_nl "GLIBC is not required" -fi core_exit.sh From d869487a332f3e759c23f45555cacf77ad0ac3ba Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 17:52:13 +0100 Subject: [PATCH 142/395] moved header --- lgsm/functions/command_dev_detect_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh index 2c8be6c42..015f18b99 100644 --- a/lgsm/functions/command_dev_detect_glibc.sh +++ b/lgsm/functions/command_dev_detect_glibc.sh @@ -56,11 +56,11 @@ do echo -n "${i} / ${glibc_check_files}" $'\r' ((i++)) done - if [ -f "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" ]; then echo "" echo "" echo "${glibc_check_name} GLIBC Requirements" echo "=================================" + if [ -f "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" ]; then echo "Required GLIBC" cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | head -1 echo "" From 78559a0e81f32bd0695e4039343388370e8dc683 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 18:01:14 +0100 Subject: [PATCH 143/395] Added final summary of GLIBC Requirement --- lgsm/functions/command_dev_detect_glibc.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh index 015f18b99..83316296e 100644 --- a/lgsm/functions/command_dev_detect_glibc.sh +++ b/lgsm/functions/command_dev_detect_glibc.sh @@ -62,10 +62,9 @@ do echo "=================================" if [ -f "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" ]; then echo "Required GLIBC" - cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | head -1 + cat "${tmpdir}/detect_glibc_${glibc_check_var}.tmp" | sort | uniq | sort -r --version-sort | head -1 |tee -a "${tmpdir}/detect_glibc_highest.tmp" echo "" echo "Files requiring GLIBC" - echo "" echo "Highest verion required: filename" cat "${tmpdir}/detect_glibc_files_${glibc_check_var}.tmp" echo "" @@ -80,4 +79,13 @@ do fn_print_information_nl "${glibc_check_name} is not installed" fi done +echo "" +echo "Final GLIBC Requirement" +echo "=================================" +if [ -f "${tmpdir}/detect_glibc_highest.tmp" ]; then + cat "${tmpdir}/detect_glibc_highest.tmp" | sort | uniq | sort -r --version-sort | head -1 + rm "${tmpdir}/detect_glibc_highest.tmp" +else + fn_print_information_nl "GLIBC is not required" +fi core_exit.sh From a08a6617d30f46c9aa55956d76228328a33abddb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 19:10:25 +0100 Subject: [PATCH 144/395] tidy --- lgsm/functions/command_dev_detect_glibc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh index 83316296e..d28846402 100644 --- a/lgsm/functions/command_dev_detect_glibc.sh +++ b/lgsm/functions/command_dev_detect_glibc.sh @@ -33,7 +33,7 @@ fi echo "" -local glibc_check_dir_array=( steamcmddir serverfiles ) +local glibc_check_dir_array=( steamcmddir serverfiles ) for glibc_check_var in "${glibc_check_dir_array[@]}" do if [ "${glibc_check_var}" == "serverfiles" ]; then From b018c879889591bf284169234c7a148726770f63 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 19:10:37 +0100 Subject: [PATCH 145/395] Added Eco and SteamCMD Glibc requirements --- lgsm/functions/info_glibc.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 308138a25..95da8ab5e 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -54,6 +54,9 @@ elif [ "${gamename}" == "Day of Infamy" ]; then elif [ "${gamename}" == "Double Action: Boogaloo" ]; then glibcrequired="2.15" glibcfix="yes" +elif [ "${gamename}" == "Eco" ]; then + glibcrequired="NOT REQUIRED" + glibcfix="no" elif [ "${gamename}" == "Empires Mod" ]; then glibcrequired="2.15" glibcfix="yes" @@ -199,3 +202,11 @@ else glibcrequired="UNKNOWN" glibcfix="no" fi + +# Sets the SteamCMD GLIBC requirement if server requirement is less. +if [ -n "${appid}" ]; then + if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ "${glibcrequired}" < "2.14" ]||[ -z "${glibcrequired}" ] ; then + glibcrequired="2.14" + glibcfix="no" + fi +fi From 983d46ea066ca8d6044d2e5d9aac20ec84bbcc9f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 19:15:42 +0100 Subject: [PATCH 146/395] Corrected SteamCMD GLIBC check --- lgsm/functions/info_glibc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 95da8ab5e..6d2ca4f20 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -203,9 +203,9 @@ else glibcfix="no" fi -# Sets the SteamCMD GLIBC requirement if server requirement is less. +# Sets the SteamCMD GLIBC requirement if the game server requirement is less or not required. if [ -n "${appid}" ]; then - if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ "${glibcrequired}" < "2.14" ]||[ -z "${glibcrequired}" ] ; then + if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ -z "${glibcrequired}" ]||[ "$(printf '%s\n'${glibcrequired}'\n' "${glibcversion}" | sort -V | head -n 1)" != "2.14" ]; then glibcrequired="2.14" glibcfix="no" fi From 1a4fa5bea8cf5316ff57f70c7da01495038f9b70 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 20:05:10 +0100 Subject: [PATCH 147/395] Added new Java requirements --- lgsm/functions/command_dev_detect_deps.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/command_dev_detect_deps.sh b/lgsm/functions/command_dev_detect_deps.sh index e65bb47d9..ea902a45c 100644 --- a/lgsm/functions/command_dev_detect_deps.sh +++ b/lgsm/functions/command_dev_detect_deps.sh @@ -55,17 +55,18 @@ while read -r lib; do echo "speex.i686" >> "${tmpdir}/.depdetect_centos_list" echo "speex:i386" >> "${tmpdir}/.depdetect_ubuntu_list" echo "speex:i386" >> "${tmpdir}/.depdetect_debian_list" - elif [ "${lib}" == "./libSDL-1.2.so.0" ]||[ "${lib}" == "libSDL-1.2.so.0" ]; then echo "SDL.i686" >> "${tmpdir}/.depdetect_centos_list" echo "libsdl1.2debian" >> "${tmpdir}/.depdetect_ubuntu_list" echo "libsdl1.2debian" >> "${tmpdir}/.depdetect_debian_list" - elif [ "${lib}" == "libtbb.so.2" ]; then echo "tbb.i686" >> "${tmpdir}/.depdetect_centos_list" echo "libtbb2" >> "${tmpdir}/.depdetect_ubuntu_list" echo "libtbb2" >> "${tmpdir}/.depdetect_debian_list" - + elif [ "${lib}" == "libawt.so" ]||[ "${lib}" == "libjava.so" ]||[ "${lib}" == "libjli.so" ]||[ "${lib}" == "libjvm.so" ]||[ "${lib}" == "libnet.so" ]||[ "${lib}" == "libnio.so" ]||[ "${lib}" == "libverify.so" ]; then + echo "java-1.8.0-openjdk" >> "${tmpdir}/.depdetect_centos_list" + echo "default-jre" >> "${tmpdir}/.depdetect_ubuntu_list" + echo "default-jre" >> "${tmpdir}/.depdetect_debian_list" elif [ "${lib}" == "libtier0.so" ]||[ "${lib}" == "libtier0_srv.so" ]||[ "${lib}" == "libvstdlib_srv.so" ]||[ "${lib}" == "Core.so" ]||[ "${lib}" == "libvstdlib.so" ]||[ "${lib}" == "libtier0_s.so" ]||[ "${lib}" == "Editor.so" ]||[ "${lib}" == "Engine.so" ]||[ "${lib}" == "liblua.so" ]||[ "${lib}" == "libsteam_api.so" ]||[ "${lib}" == "ld-linux-x86-64.so.2" ]||[ "${lib}" == "libPhysX3_x86.so" ]||[ "${lib}" == "libPhysX3Common_x86.so" ]||[ "${lib}" == "libPhysX3Cooking_x86.so" ]; then # Known shared libs what dont requires dependencies : From 06a7fa24b091f3e45289f4c2b6a09c29c4ebaf6b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 16 Jun 2018 22:42:30 +0100 Subject: [PATCH 148/395] Added rng-tools as a requirement for Project Zomboid --- lgsm/functions/check_deps.sh | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index ef86fb396..4ecddb178 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -260,14 +260,23 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then # Hurtword/Rust elif [ "${gamename}" == "Hurtword" ]||[ "${gamename}" == "Rust" ]; then array_deps_required+=( lib32z1 ) - # Project Zomboid and Minecraft - elif [ "${engine}" == "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then + # Minecraft + elif [ "${shortname}" == "mc" ]; then javaversion=$(java -version 2>&1 | grep "version") if [ -n "${javaversion}" ]; then javacheck=1 # Added for users using Oracle JRE to bypass the check. else array_deps_required+=( default-jre ) fi + # Project Zomboid + elif [ "${engine}" == "projectzomboid" ]; then + javaversion=$(java -version 2>&1 | grep "version") + if [ -n "${javaversion}" ]; then + javacheck=1 # Added for users using Oracle JRE to bypass the check. + array_deps_required+=( rng-tools ) + else + array_deps_required+=( default-jre rng-tools ) + fi # GoldenEye: Source elif [ "${gamename}" == "GoldenEye: Source" ]; then array_deps_required+=( zlib1g:i386 libldap-2.4-2:i386 ) @@ -355,13 +364,22 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then array_deps_required+=( xz ) elif [ "${gamename}" == "Hurtword" ]||[ "${gamename}" == "Rust" ]; then array_deps_required+=( zlib-devel ) - # Project Zomboid and Minecraft + # Minecraft + elif [ "${shortname}" == "mc" ]; then + javaversion=$(java -version 2>&1 | grep "version") + if [ -n "${javaversion}" ]; then + javacheck=1 # Added for users using Oracle JRE to bypass the check. + array_deps_required+=( java-1.8.0-openjdk ) + else + array_deps_required+=( java-1.8.0-openjdk rng-tools ) + fi + # Project Zomboid elif [ "${engine}" == "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then javaversion=$(java -version 2>&1 | grep "version") if [ -n "${javaversion}" ]; then javacheck=1 # Added for users using Oracle JRE to bypass the check. else - array_deps_required+=( java-1.8.0-openjdk ) + array_deps_required+=( java-1.8.0-openjdk rng-tools ) fi # GoldenEye: Source elif [ "${gamename}" == "GoldenEye: Source" ]; then From 0934523f3224ae56bd7b4acf569bb4de4ad0c938 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 14:31:03 +0100 Subject: [PATCH 149/395] modifications for #1779 --- lgsm/functions/check_deps.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 4ecddb178..efc913da3 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -8,7 +8,7 @@ local commandname="CHECK" fn_add_mono_repo(){ # TODO: Detect correct distro and version for source url - if [ "${monocheck}" != "0" ]; then + if [ "${monostatus}" != "0" ]; then fn_print_dots_nl "Adding Mono repository" sleep 0.5 sudo -v > /dev/null 2>&1 @@ -65,19 +65,19 @@ fn_deps_detector(){ deptocheck="${javaversion}" unset javacheck elif [ "${deptocheck}" == "mono-complete" ]; then - if [[ -n "$(mono --version)" && "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]]; then + if [ "$(command -v mono 2>/dev/null)" && "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed depstatus=0 else # Mono not installed or installed Mono < 5.0.0 depstatus=1 - monocheck=1 + monostatus=1 fi elif [ -n "$(command -v apt 2>/dev/null)" ]; then dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed' depstatus=$? - elif [ -n "$(command -v yum 2>/dev/null)" ]; then - yum -q list installed "${deptocheck}" > /dev/null 2>&1 + elif [ -n "$(command -v rpm 2>/dev/null)" ]; then + rpm -q list installed "${deptocheck}" > /dev/null 2>&1 depstatus=$? fi @@ -113,13 +113,13 @@ fn_deps_email(){ array_deps_required+=( sendmail ) elif [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then array_deps_required+=( mailutils postfix ) - elif [ -n "$(command -v yum 2>/dev/null)" ]; then + elif [ -n "$(command -v rpm 2>/dev/null)" ]; then array_deps_required+=( mailx postfix ) fi else if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then array_deps_required+=( mailutils postfix ) - elif [ -n "$(command -v yum 2>/dev/null)" ]; then + elif [ -n "$(command -v rpm 2>/dev/null)" ]; then array_deps_required+=( mailx postfix ) fi fi @@ -133,7 +133,7 @@ fn_found_missing_deps(){ fn_print_error_nl "Checking dependencies: missing: ${red}${array_deps_missing[@]}${default}" fn_script_log_error "Checking dependencies: missing: ${array_deps_missing[@]}" sleep 0.5 - if [ -n monocheck ]; then + if [ -n "${monostatus}" ]; then fn_add_mono_repo fi sleep 0.5 @@ -151,6 +151,9 @@ fn_found_missing_deps(){ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then cmd="sudo dpkg --add-architecture i386; sudo apt update; sudo apt -y install ${array_deps_missing[@]}" eval "${cmd}" + elif [ -n "$(command -v dnf 2>/dev/null)" ]; then + cmd="sudo dnf -y install ${array_deps_missing[@]}" + eval "${cmd}" elif [ -n "$(command -v yum 2>/dev/null)" ]; then cmd="sudo yum -y install ${array_deps_missing[@]}" eval "${cmd}" @@ -168,6 +171,8 @@ fn_found_missing_deps(){ fn_script_log_warn "$(whoami) does not have sudo access. Manually install dependencies." if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then echo " sudo dpkg --add-architecture i386; sudo apt update; sudo apt install ${array_deps_missing[@]}" + elif [ -n "$(command -v dnf 2>/dev/null)" ]; then + echo " sudo dnf install ${array_deps_missing[@]}" elif [ -n "$(command -v yum 2>/dev/null)" ]; then echo " sudo yum install ${array_deps_missing[@]}" fi @@ -198,7 +203,7 @@ if [ "${function_selfname}" == "command_install.sh" ]; then echo "=================================" fi -# Check will only run if using apt or yum +# Check will only run if using apt dnf or yum if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then # Generate array of missing deps array_deps_missing=() @@ -302,14 +307,14 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then fn_deps_email fn_check_loop -elif [ -n "$(command -v yum 2>/dev/null)" ]; then +elif [ -n "$(command -v yum 2>/dev/null)" ]||[ -n "$(command -v dnf 2>/dev/null)" ]; then # Generate array of missing deps array_deps_missing=() # LinuxGSM requirements if [ "${distroversion}" == "6" ]; then array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc ) - elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then + elif [ "${distroname}" == *"Amazon Linux AMI"* ]; then array_deps_required=( curl wget util-linux python27 file gzip bzip2 unzip binutils bc ) else array_deps_required=( curl wget util-linux python file gzip bzip2 unzip binutils bc ) From 93cbcd1dec5731fec2fe50348661b457094f72da Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 14:50:20 +0100 Subject: [PATCH 150/395] corrected rpm command --- 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 efc913da3..ac85dba8c 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -77,7 +77,7 @@ fn_deps_detector(){ dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed' depstatus=$? elif [ -n "$(command -v rpm 2>/dev/null)" ]; then - rpm -q list installed "${deptocheck}" > /dev/null 2>&1 + rpm -q "${deptocheck}" > /dev/null 2>&1 depstatus=$? fi From 434d52f40103bb934351a07b5d04ec1073117a49 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 15:08:18 +0100 Subject: [PATCH 151/395] added distroid --- lgsm/functions/info_distro.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 1b04f50c8..ca19e7380 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -27,6 +27,7 @@ fi if [ -f "/etc/os-release" ]; then distroversion=$(grep VERSION_ID /etc/os-release | tr -cd '[:digit:]') + distroid=$(grep ID /etc/os-release | grep -v _ID | sed 's/ID=//g') elif [ -n "$(command -v yum)" ]; then distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos" | cut -d"-" -f3) fi From 76c0bd7b7e2666efff5e555d56c937e72643db7c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 15:09:00 +0100 Subject: [PATCH 152/395] added fedora to specify python2 --- lgsm/functions/check_deps.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index ac85dba8c..8c6c261cb 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -314,8 +314,10 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]||[ -n "$(command -v dnf 2>/dev/null) # LinuxGSM requirements if [ "${distroversion}" == "6" ]; then array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc ) + elif [ "${distroid}" == "fedora" ]; then + array_deps_required=( curl wget util-linux python2 file gzip bzip2 unzip binutils bc ) elif [ "${distroname}" == *"Amazon Linux AMI"* ]; then - array_deps_required=( curl wget util-linux python27 file gzip bzip2 unzip binutils bc ) + array_deps_required=( curl wget util-linux python27 file gzip bzip2 unzip binutils bc ) else array_deps_required=( curl wget util-linux python file gzip bzip2 unzip binutils bc ) fi From d474b17ef2fe928708b8e1aff1c97abbf0f07ab6 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 16:25:28 +0100 Subject: [PATCH 153/395] updated distroid and distroversion --- lgsm/functions/info_distro.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index ca19e7380..9ee097678 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -26,8 +26,8 @@ else fi if [ -f "/etc/os-release" ]; then - distroversion=$(grep VERSION_ID /etc/os-release | tr -cd '[:digit:]') - distroid=$(grep ID /etc/os-release | grep -v _ID | sed 's/ID=//g') + distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g') + distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g') elif [ -n "$(command -v yum)" ]; then distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos" | cut -d"-" -f3) fi From a62d075d1f3033ac9a2db4c647e786a3b4746398 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 16:40:17 +0100 Subject: [PATCH 154/395] Updated distro detection --- lgsm/functions/info_distro.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 9ee097678..1eac29ab4 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -13,23 +13,26 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Returns architecture, kernel and distro/os. arch=$(uname -m) kernel=$(uname -r) -if [ -n "$(command -v lsb_release)" ]; then - distroname=$(lsb_release -s -d) -elif [ -f "/etc/os-release" ]; then + +# Distro name - Ubuntu 16.04 +# Distro Version - 16.04 +# Distro ID - ubuntu +if [ -f "/etc/os-release" ]; then distroname=$(grep PRETTY_NAME /etc/os-release | sed 's/PRETTY_NAME=//g' | tr -d '="') + distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g') + distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g') +if [ -n "$(command -v lsb_release)" ]; then + distroname="$(lsb_release -sd)" + distroversion="$(lsb_release -sr)" + distroid=$(lsb_release -sc) elif [ -f "/etc/debian_version" ]; then distroname="Debian $(cat /etc/debian_version)" + distroversion="$(cat /etc/debian_version)" + distroid="debian" elif [ -f "/etc/redhat-release" ]; then distroname=$(cat /etc/redhat-release) -else - distroname="$(uname -s) $(uname -r)" -fi - -if [ -f "/etc/os-release" ]; then - distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g') - distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g') -elif [ -n "$(command -v yum)" ]; then - distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos" | cut -d"-" -f3) + distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos|fedora" | cut -d"-" -f3) + distroid="$(wk '{print $1;}' /etc/redhat-release)" fi ## Glibc version From 7dc37b5e4d6facb5dce8b90cd5139f837df0a6b9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 17:26:55 +0100 Subject: [PATCH 155/395] Updated RAM usage to work with changes to free command --- lgsm/functions/info_distro.sh | 3 ++- lgsm/functions/info_messages.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 1eac29ab4..9fe2547a3 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -77,9 +77,10 @@ physmemtotal=$(free ${humanreadable} | awk '/Mem:/ {print $2}') physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}') physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}') physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}') +physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}') physmemcached=$(free ${humanreadable} | awk '/cache:/ {print $4}') if [ -z "${physmemcached}" ]; then - physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $5}') + physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $6}') fi swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}') diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index bb6fc00f9..a5283c2f1 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -71,8 +71,8 @@ fn_info_message_performance(){ } | column -s $'\t' -t echo -e "" { - echo -e "${blue}Mem:\t${blue}total\t used\t free\t cached${default}" - echo -e "${blue}Physical:\t${default}${physmemtotal}\t${physmemused}\t${physmemfree}\t${physmemcached}${default}" + echo -e "${blue}Mem:\t${blue}total\t used\t free\t cached\t available${default}" + echo -e "${blue}Physical:\t${default}${physmemtotal}\t${physmemused}\t${physmemfree}\t${physmemcached}\t${physmemavailable}${default}" echo -e "${blue}Swap:\t${default}${swaptotal}\t${swapused}\t${swapfree}${default}" } | column -s $'\t' -t } From 8f48818e018d4841e496d71dfcb8713ed0859f42 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 17:31:08 +0100 Subject: [PATCH 156/395] corrected if --- lgsm/functions/info_distro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 9fe2547a3..aaff1aacc 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -21,7 +21,7 @@ if [ -f "/etc/os-release" ]; then distroname=$(grep PRETTY_NAME /etc/os-release | sed 's/PRETTY_NAME=//g' | tr -d '="') distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g') distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g') -if [ -n "$(command -v lsb_release)" ]; then +elif [ -n "$(command -v lsb_release)" ]; then distroname="$(lsb_release -sd)" distroversion="$(lsb_release -sr)" distroid=$(lsb_release -sc) From acd39bfbcdcc3bcafba7b65ddfc38f5b82aadc5a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 17:33:32 +0100 Subject: [PATCH 157/395] added physicalmemavailable n/a for older distros --- lgsm/functions/info_distro.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index aaff1aacc..e4ad418ba 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -78,6 +78,9 @@ physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}') physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}') physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}') physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}') +if [ -z "${physmemavailable}" ]; then + physmemavailable="n/a" +fi physmemcached=$(free ${humanreadable} | awk '/cache:/ {print $4}') if [ -z "${physmemcached}" ]; then physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $6}') From 72771776e68b1eba08a127750356eafc7e9baca8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 17:48:59 +0100 Subject: [PATCH 158/395] Cached details to be removed from older version of free as confusing --- lgsm/functions/info_distro.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index e4ad418ba..ea345d0a3 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -77,14 +77,15 @@ physmemtotal=$(free ${humanreadable} | awk '/Mem:/ {print $2}') physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}') physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}') physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}') -physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}') -if [ -z "${physmemavailable}" ]; then +oldfree=$(free ${humanreadable} | awk '/cache:/') +if [ -n "${oldfree}" ]; then physmemavailable="n/a" + physmemcached="n/a" +else + physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}') + physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $5}') fi -physmemcached=$(free ${humanreadable} | awk '/cache:/ {print $4}') -if [ -z "${physmemcached}" ]; then - physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $6}') -fi + swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}') swapfree=$(free ${humanreadable} | awk '/Swap:/ {print $4}') From 4ae143afba80791152a617080aaf3189c769fe06 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 17:51:11 +0100 Subject: [PATCH 159/395] corrected cache details --- lgsm/functions/info_distro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index ea345d0a3..764d6986d 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -83,7 +83,7 @@ if [ -n "${oldfree}" ]; then physmemcached="n/a" else physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}') - physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $5}') + physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $6}') fi swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') From 67436b10165dd3bb3a64162fad8ce7eba6fe1afc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Jun 2018 20:23:31 +0100 Subject: [PATCH 160/395] Distro info is now a loop that fills in missing gaps --- lgsm/functions/info_distro.sh | 62 +++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 764d6986d..f8434ef1e 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -14,26 +14,52 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" arch=$(uname -m) kernel=$(uname -r) -# Distro name - Ubuntu 16.04 +# Distro Name - Ubuntu 16.04 LTS # Distro Version - 16.04 # Distro ID - ubuntu -if [ -f "/etc/os-release" ]; then - distroname=$(grep PRETTY_NAME /etc/os-release | sed 's/PRETTY_NAME=//g' | tr -d '="') - distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g') - distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g') -elif [ -n "$(command -v lsb_release)" ]; then - distroname="$(lsb_release -sd)" - distroversion="$(lsb_release -sr)" - distroid=$(lsb_release -sc) -elif [ -f "/etc/debian_version" ]; then - distroname="Debian $(cat /etc/debian_version)" - distroversion="$(cat /etc/debian_version)" - distroid="debian" -elif [ -f "/etc/redhat-release" ]; then - distroname=$(cat /etc/redhat-release) - distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos|fedora" | cut -d"-" -f3) - distroid="$(wk '{print $1;}' /etc/redhat-release)" -fi +# Distro Codename - xenial + +# Gathers distro info from various sources filling in missing gaps +distro_info_array=( os-release lsb_release hostnamectl debian_version redhat-release ) +for distro_info in "${distro_info_array[@]}" +do + if [ -f "/etc/os-release" ]&&[ "${distro_info}" == "os-release" ]; then + distroname=$(grep PRETTY_NAME /etc/os-release | sed 's/PRETTY_NAME=//g' | tr -d '="' | sed 's/\"//g') + distroversion=$(grep VERSION_ID /etc/os-release | sed 's/VERSION_ID=//g' | sed 's/\"//g') + distroid=$(grep ID /etc/os-release | grep -v _ID | grep -v ID_ | sed 's/ID=//g' | sed 's/\"//g') + distrocodename=$(grep VERSION_CODENAME /etc/os-release | sed 's/VERSION_CODENAME=//g' | sed 's/\"//g') + elif [ -n "$(command -v lsb_release 2>/dev/null)" ]&&[ "${distro_info}" == "lsb_release" ]; then + if [ -z "${distroname}" ];then + distroname="$(lsb_release -sd)" + elif [ -z "${distroversion}" ];then + distroversion="$(lsb_release -sr)" + elif [ -z "${distroid}" ];then + distroid=$(lsb_release -si) + elif [ -z "${distrocodename}" ];then + distrocodename=$(lsb_release -sc) + fi + elif [ -n "$(command -v hostnamectl 2>/dev/null)" ]&&[ "${distro_info}" == "hostnamectl" ]; then + if [ -z "${distroname}" ];then + distroname="$(hostnamectl | grep "Operating System" | sed 's/Operating System: //g')" + fi + elif [ -f "/etc/debian_version" ]&&[ "${distro_info}" == "debian_version" ]; then + if [ -z "${distroname}" ];then + distroname="Debian $(cat /etc/debian_version)" + elif [ -z "${distroversion}" ];then + distroversion="$(cat /etc/debian_version)" + elif [ -z "${distroid}" ];then + distroid="debian" + fi + elif [ -f "/etc/redhat-release" ]&&[ "${distro_info}" == "redhat-release" ]; then + if [ -z "${distroname}" ];then + distroname=$(cat /etc/redhat-release) + elif [ -z "${distroversion}" ];then + distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos|fedora" | cut -d"-" -f3) + elif [ -z "${distroid}" ];then + distroid="$(wk '{print $1;}' /etc/redhat-release)" + fi + fi +done ## Glibc version # e.g: 1.17 From 83c17a48dd38fe1989f2d405f951e7490a12da31 Mon Sep 17 00:00:00 2001 From: Cypher100 Date: Sat, 23 Jun 2018 18:49:10 -0500 Subject: [PATCH 161/395] Use +maxplayers instead of -maxplayers Svencoop uses +maxplayers to specify max players, not -maxplayers. If -maxplayers is utilized, it will default to 2 slots regardless of specified players. --- lgsm/config-default/config-lgsm/svenserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/svenserver/_default.cfg b/lgsm/config-default/config-lgsm/svenserver/_default.cfg index 455e170a1..7472e7e96 100644 --- a/lgsm/config-default/config-lgsm/svenserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/svenserver/_default.cfg @@ -17,7 +17,7 @@ maxplayers="16" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="-game svencoop -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}" +parms="-game svencoop -strictportbind +ip ${ip} -port ${port} +clientport ${clientport} +map ${defaultmap} +servercfgfile ${servercfg} +maxplayers ${maxplayers}" } #### LinuxGSM Settings #### From 1325f6b994d4f41c93f5d8aa312f06131754c844 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Jul 2018 13:06:08 +0100 Subject: [PATCH 162/395] Added SS3 fix --- lgsm/functions/fix.sh | 2 ++ lgsm/functions/fix_ss3.sh | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 lgsm/functions/fix_ss3.sh diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index 2872b806f..4b4ce1b76 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -58,6 +58,8 @@ if [ "${function_selfname}" != "command_install.sh" ]; then fix_rust.sh elif [ "${shortname}" == "rw" ]; then fix_rw.sh + elif [ "${shortname}" == "ss3" ]; then + fix_ss3.sh elif [ "${gamename}" == "Multi Theft Auto" ]; then fix_mta.sh fi diff --git a/lgsm/functions/fix_ss3.sh b/lgsm/functions/fix_ss3.sh new file mode 100644 index 000000000..3ebbc3910 --- /dev/null +++ b/lgsm/functions/fix_ss3.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# LinuxGSM fix_ss3.sh function +# Author: Daniel Gibbs +# Website: https://linuxgsm.com +# Description: Resolves various issues with Serious Sam 3. + +local commandname="FIX" +local commandaction="Fix" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" + +# Fixes https://steamcommunity.com/app/41070/discussions/0/353916981477716386/ +if [ "$(diff "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Bin/steamclient.so" >/dev/null)" ]; then + cp -f "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Bin/steamclient.so" +fi \ No newline at end of file From b01a28d48426fb687bdf5052e66bcf6c0c78b3f2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Jul 2018 13:06:35 +0100 Subject: [PATCH 163/395] Added new dependency detection --- lgsm/functions/command_dev_detect_deps.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lgsm/functions/command_dev_detect_deps.sh b/lgsm/functions/command_dev_detect_deps.sh index ea902a45c..8f3949b37 100644 --- a/lgsm/functions/command_dev_detect_deps.sh +++ b/lgsm/functions/command_dev_detect_deps.sh @@ -35,6 +35,7 @@ done sort "${tmpdir}/.depdetect_readelf" |uniq >"${tmpdir}/.depdetect_readelf_uniq" while read -r lib; do + echo "${lib}" if [ "${lib}" == "libm.so.6" ]||[ "${lib}" == "libc.so.6" ]||[ "${lib}" == "libtcmalloc_minimal.so.4" ]||[ "${lib}" == "libpthread.so.0" ]||[ "${lib}" == "libdl.so.2" ]||[ "${lib}" == "libnsl.so.1" ]||[ "${lib}" == "libgcc_s.so.1" ]||[ "${lib}" == "librt.so.1" ]||[ "${lib}" == "ld-linux.so.2" ]; then echo "glibc.i686" >> "${tmpdir}/.depdetect_centos_list" echo "lib32gcc1" >> "${tmpdir}/.depdetect_ubuntu_list" @@ -67,6 +68,19 @@ while read -r lib; do echo "java-1.8.0-openjdk" >> "${tmpdir}/.depdetect_centos_list" echo "default-jre" >> "${tmpdir}/.depdetect_ubuntu_list" echo "default-jre" >> "${tmpdir}/.depdetect_debian_list" + elif [ "${lib}" == "libXrandr.so.2" ]; then + echo "libXrandr" >> "${tmpdir}/.depdetect_centos_list" + echo "libxrandr2" >> "${tmpdir}/.depdetect_ubuntu_list" + echo "libxrandr2" >> "${tmpdir}/.depdetect_debian_list" + elif [ "${lib}" == "libXext.so.6" ]; then + echo "libXext" >> "${tmpdir}/.depdetect_centos_list" + echo "libxext6" >> "${tmpdir}/.depdetect_ubuntu_list" + echo "libxext6" >> "${tmpdir}/.depdetect_debian_list" + elif [ "${lib}" == "libXtst.so.6" ]; then + echo "libXtst" >> "${tmpdir}/.depdetect_centos_list" + echo "libxtst6" >> "${tmpdir}/.depdetect_ubuntu_list" + echo "libxtst6" >> "${tmpdir}/.depdetect_debian_list" + elif [ "${lib}" == "libtier0.so" ]||[ "${lib}" == "libtier0_srv.so" ]||[ "${lib}" == "libvstdlib_srv.so" ]||[ "${lib}" == "Core.so" ]||[ "${lib}" == "libvstdlib.so" ]||[ "${lib}" == "libtier0_s.so" ]||[ "${lib}" == "Editor.so" ]||[ "${lib}" == "Engine.so" ]||[ "${lib}" == "liblua.so" ]||[ "${lib}" == "libsteam_api.so" ]||[ "${lib}" == "ld-linux-x86-64.so.2" ]||[ "${lib}" == "libPhysX3_x86.so" ]||[ "${lib}" == "libPhysX3Common_x86.so" ]||[ "${lib}" == "libPhysX3Cooking_x86.so" ]; then # Known shared libs what dont requires dependencies : From e8b23ff9d9b99c67054596e4f29570b1ba3c107f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Jul 2018 13:06:43 +0100 Subject: [PATCH 164/395] typo --- lgsm/functions/fix_kf2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/fix_kf2.sh b/lgsm/functions/fix_kf2.sh index ad132bf72..02940bf07 100644 --- a/lgsm/functions/fix_kf2.sh +++ b/lgsm/functions/fix_kf2.sh @@ -1,5 +1,5 @@ #!/bin/bash -# LinuxGSM fix_kf3.sh function +# LinuxGSM fix_kf2.sh function # Author: Daniel Gibbs # Website: https://linuxgsm.com # Description: Resolves various issues with Killing Floor 2. From ee8147b3303c90e5ecc06e93639ce9148a548e99 Mon Sep 17 00:00:00 2001 From: T1MOXA Date: Wed, 4 Jul 2018 03:45:16 +0300 Subject: [PATCH 165/395] Fix for subnets --- lgsm/functions/check_ip.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 507a1a51a..a054bf6a0 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -14,8 +14,8 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi else ipcommand="ip" fi - getip=$(${ipcommand} -o -4 addr| awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -v 127.0.0) - getipwc=$(${ipcommand} -o -4 addr| awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}' | grep -vc 127.0.0) + getip=$(${ipcommand} -o -4 addr|awk '{print $4}'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|sort -u|grep -v 127.0.0) + getipwc=$(${ipcommand} -o -4 addr|awk '{print $4}'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|sort -u|grep -vc 127.0.0) info_config.sh info_parms.sh From a62b313de3be7cba968d218f50acb3647aaec5f5 Mon Sep 17 00:00:00 2001 From: Cripix Date: Sun, 8 Jul 2018 02:08:38 +0200 Subject: [PATCH 166/395] Update to new stable version of sourcemod --- lgsm/functions/mods_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index dd5ab02c0..286078387 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -21,7 +21,7 @@ metamodlatestfile="$(wget "${metamodscrapeurl}" -q -O -)" metamoddownloadurl="https://www.metamodsource.net/latest.php?os=linux&version=${metamodmversion}" metamodurl="${metamoddownloadurl}" # Sourcemod -sourcemodmversion="1.8" +sourcemodmversion="1.9" sourcemodscrapeurl="https://sm.alliedmods.net/smdrop/${sourcemodmversion}/sourcemod-latest-linux" sourcemodlatestfile="$(wget "${sourcemodscrapeurl}" -q -O -)" sourcemoddownloadurl="https://www.sourcemod.net/latest.php?os=linux&version=${sourcemodmversion}" From 68d847c76054406934a05aad106df238021ca922 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 17 Jul 2018 23:05:25 +0100 Subject: [PATCH 167/395] Added nogui command to minecraft executable --- lgsm/config-default/config-lgsm/mcserver/_default.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg index 80339b11a..a3f973da4 100644 --- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg @@ -57,7 +57,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,7 +89,7 @@ engine="lwjgl2" ## Server Specific Directories systemdir="${serverfiles}" executabledir="${serverfiles}" -executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar" +executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar nogui" servercfg="server.properties" servercfgdefault="server.properties" servercfgdir="${serverfiles}" From da988c943f96b8b313bd6cb79f0b3a70b7fa0dae Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 17 Jul 2018 23:15:02 +0100 Subject: [PATCH 168/395] Refactor of check_deps now includes dnf and mono support --- lgsm/functions/check_deps.sh | 182 +++++++++++++++++++---------------- 1 file changed, 101 insertions(+), 81 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 8c6c261cb..842872c76 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -7,14 +7,13 @@ local commandname="CHECK" fn_add_mono_repo(){ - # TODO: Detect correct distro and version for source url if [ "${monostatus}" != "0" ]; then fn_print_dots_nl "Adding Mono repository" sleep 0.5 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then - fn_print_information_nl "Automatically adding repository." - fn_script_log_info "Automatically adding repository." + fn_print_information_nl "Automatically adding Mono repository." + fn_script_log_info "Automatically adding Mono repository." echo -en ".\r" sleep 1 echo -en "..\r" @@ -22,32 +21,44 @@ fn_add_mono_repo(){ echo -en "...\r" sleep 1 echo -en " \r" - if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then - cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && echo 'deb http://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && sudo apt-get update" + if [ "${distroid}" == "ubuntu" ]; then + cmd="sudo apt-key adv --keyserver http://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb http://download.mono-project.com/repo/ubuntu stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt-get update" eval ${cmd} - elif [ -n "$(command -v yum 2>/dev/null)" ]; then - cmd="rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" + elif [ "${distroid}" == "debian" ]; then + cmd="sudo apt install apt-transport-https dirmngr; sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb https://download.mono-project.com/repo/debian stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt update" + eval ${cmd} + elif [ "${distroid}" == "centos" ]; then + cmd="rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos${distroversion}-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" + eval ${cmd} + elif [ "${distroid}" == "fedora" ]; then + cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'; su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'; dnf update" eval ${cmd} fi if [ $? != 0 ]; then fn_print_failure_nl "Unable to add Mono repository" fn_script_log_fatal "Unable to add Mono repository" - exit 1 + monoautoinstall=1 else fn_print_complete_nl "Add Mono repository completed" fn_script_log_pass "Add Mono repository completed" + monoautoinstall=0 fi - else + fi + sudo -v > /dev/null 2>&1 + if [ $? -eq 0 ]; then echo "" fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Mono repository." fn_script_log_warn "$(whoami) does not have sudo access. Manually add Mono repository." - if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then - echo " sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && echo 'deb http://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list && sudo apt-get update" - elif [ -n "$(command -v yum 2>/dev/null)" ]; then - echo " rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" + if [ "${distroid}" == "ubuntu" ]; then + echo " sudo apt-key adv --keyserver http://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb http://download.mono-project.com/repo/ubuntu stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt-get update" + elif [ "${distroid}" == "debian" ]; then + echo " sudo apt install apt-transport-https dirmngr; sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb https://download.mono-project.com/repo/debian stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt update" + elif [ "${distroid}" == "centos" ]; then + echo " rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos${distroversion}-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" + elif [ "${distroid}" == "fedora" ]; then + echo " rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'; su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'; dnf update" fi echo "" - exit 1 fi fi } @@ -65,7 +76,7 @@ fn_deps_detector(){ deptocheck="${javaversion}" unset javacheck elif [ "${deptocheck}" == "mono-complete" ]; then - if [ "$(command -v mono 2>/dev/null)" && "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then + if [ "$(command -v mono 2>/dev/null)" && "$(mono --version 2>&1) | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed depstatus=0 else @@ -73,7 +84,7 @@ fn_deps_detector(){ depstatus=1 monostatus=1 fi - elif [ -n "$(command -v apt 2>/dev/null)" ]; then + elif [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed' depstatus=$? elif [ -n "$(command -v rpm 2>/dev/null)" ]; then @@ -136,7 +147,6 @@ fn_found_missing_deps(){ if [ -n "${monostatus}" ]; then fn_add_mono_repo fi - sleep 0.5 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then fn_print_information_nl "Automatically installing missing dependencies." @@ -195,24 +205,16 @@ fn_check_loop(){ fn_found_missing_deps } -info_distro.sh - -if [ "${function_selfname}" == "command_install.sh" ]; then - echo "" - echo "Checking Dependencies" - echo "=================================" -fi - -# Check will only run if using apt dnf or yum -if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then +# Generate require dependencies for debian based systems +fn_deps_build_debian(){ # Generate array of missing deps array_deps_missing=() - # LinuxGSM requirements + ## LinuxGSM requirements array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python bzip2 gzip unzip binutils bc ) # All servers except ts3 require tmux - if [ "${gamename}" != "TeamSpeak 3" ]; then + if [ "${shortname}" != "ts3" ]; then if [ "$(command -v tmux 2>/dev/null)" ]; then tmuxcheck=1 # Added for users compiling tmux from source to bypass check. else @@ -220,8 +222,8 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then fi fi - # All servers except ts3,mumble,multitheftauto and minecraft servers require libstdc++6 and lib32gcc1 - if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${engine}" != "lwjgl2" ]&&[ "${engine}" != "renderware" ]; then + # All servers except ts3, mumble, GTA and minecraft servers require libstdc++6 and lib32gcc1 + if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${engine}" != "renderware" ]; then if [ "${arch}" == "x86_64" ]; then array_deps_required+=( lib32gcc1 libstdc++6:i386 ) else @@ -229,89 +231,90 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then fi fi - # Game Specific requirements + ## Game Specific requirements - # Natural Selection 2 - if [ "${gamename}" == "Natural Selection 2" ]; then + # Natural Selection 2 - x64 only + if [ "${shortname}" == "ns2" ]; then array_deps_required+=( speex libtbb2 ) # NS2: Combat - elif [ "${gamename}" == "NS2: Combat" ]; then + elif [ "${shortname}" == "ns2c" ]; then array_deps_required+=( speex:i386 libtbb2 ) # 7 Days to Die - elif [ "${gamename}" == "7 Days To Die" ]; then + elif [ "${shortname}" == "sdtd" ]; then array_deps_required+=( telnet expect ) # No More Room in Hell, Counter-Strike: Source and Garry's Mod - elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]||[ "${gamename}" == "Zombie Panic! Source" ]; then + elif [ "${shortname}" == "nmrih" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "zps" ]; then if [ "${arch}" == "x86_64" ]; then array_deps_required+=( lib32tinfo5 ) else array_deps_required+=( libtinfo5 ) fi # Brainbread 2 ,Don't Starve Together & Team Fortress 2 - elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]||[ "${gamename}" == "Team Fortress 2" ]; then + elif [ "${shortname}" == "bb2" ]||[ "${shortname}" == "dst" ]||[ "${shortname}" == "tf2" ]; then array_deps_required+=( libcurl4-gnutls-dev:i386 ) - if [ "${gamename}" == "Team Fortress 2" ]; then + if [ "${shortname}" == "tf2" ]; then array_deps_required+=( libtcmalloc-minimal4:i386 ) fi # Battlefield: 1942 - elif [ "${gamename}" == "Battlefield: 1942" ]; then + elif [ "${shortname}" == "bf1942" ]; then array_deps_required+=( libncurses5:i386 ) # Call of Duty - elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty: United Offensive" ]||[ "${gamename}" == "Call of Duty 2" ]; then + elif [ "${shortname}" == "cod" ]||[ "${shortname}" == "coduo" ]||[ "${shortname}" == "cod2" ]; then array_deps_required+=( libstdc++5:i386 ) # Factorio - elif [ "${gamename}" == "Factorio" ]; then + elif [ "${shortname}" == "fctr" ]; then array_deps_required+=( xz-utils ) # Hurtword/Rust - elif [ "${gamename}" == "Hurtword" ]||[ "${gamename}" == "Rust" ]; then + elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then array_deps_required+=( lib32z1 ) # Minecraft elif [ "${shortname}" == "mc" ]; then javaversion=$(java -version 2>&1 | grep "version") - if [ -n "${javaversion}" ]; then + if [ "${javaversion}" ]; then javacheck=1 # Added for users using Oracle JRE to bypass the check. else - array_deps_required+=( default-jre ) + array_deps_required+=( openjdk-8-jre-headless ) fi # Project Zomboid - elif [ "${engine}" == "projectzomboid" ]; then - javaversion=$(java -version 2>&1 | grep "version") - if [ -n "${javaversion}" ]; then + elif [ "${shortname}" == "pz" ]; then + if [ -n "$(java -version 2>&1 | grep "version")" ]; then javacheck=1 # Added for users using Oracle JRE to bypass the check. array_deps_required+=( rng-tools ) else array_deps_required+=( default-jre rng-tools ) fi # GoldenEye: Source - elif [ "${gamename}" == "GoldenEye: Source" ]; then + elif [ "${shortname}" == "ges" ]; then array_deps_required+=( zlib1g:i386 libldap-2.4-2:i386 ) # Serious Sam 3: BFE - elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then + elif [ "${shortname}" == "ss3" ]; then array_deps_required+=( libxrandr2:i386 libglu1-mesa:i386 libxtst6:i386 libusb-1.0-0-dev:i386 libxxf86vm1:i386 libopenal1:i386 libssl1.0.0:i386 libgtk2.0-0:i386 libdbus-glib-1-2:i386 libnm-glib-dev:i386 ) # Unreal Engine - elif [ "${executable}" == "./ucc-bin" ]; then + elif [ "${executable}" == "./ucc-bin" ]; then #UT2K4 if [ -f "${executabledir}/ut2004-bin" ]; then - array_deps_required+=( libsdl1.2debian libstdc++5:i386 bzip2 ) + array_deps_required+=( libsdl1.2debian libstdc++5:i386 ) #UT99 else - array_deps_required+=( libsdl1.2debian bzip2 ) + array_deps_required+=( libsdl1.2debian ) fi # Unreal Tournament - elif [ "${gamename}" == "Unreal Tournament" ]; then + elif [ "${shortname}" == "ut" ]; then array_deps_required+=( unzip ) # Eco - elif [ "${gamename}" == "Eco" ]; then + elif [ "${shortname}" == "eco" ]; then array_deps_required+=( mono-complete ) fi fn_deps_email fn_check_loop +} -elif [ -n "$(command -v yum 2>/dev/null)" ]||[ -n "$(command -v dnf 2>/dev/null)" ]; then +fn_deps_build_redhat(){ # Generate array of missing deps array_deps_missing=() # LinuxGSM requirements + ## CentOS 6 if [ "${distroversion}" == "6" ]; then array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc ) elif [ "${distroid}" == "fedora" ]; then @@ -323,7 +326,7 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]||[ -n "$(command -v dnf 2>/dev/null) fi # All servers except ts3 require tmux - if [ "${gamename}" != "TeamSpeak 3" ]; then + if [ "${shortname}" != "ts3" ]; then if [ "$(command -v tmux 2>/dev/null)" ]; then tmuxcheck=1 # Added for users compiling tmux from source to bypass check. else @@ -332,67 +335,68 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]||[ -n "$(command -v dnf 2>/dev/null) fi # All servers except ts3,mumble,multitheftauto and minecraft servers require glibc.i686 and libstdc++.i686 - if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${engine}" != "lwjgl2" ]&&[ "${engine}" != "renderware" ]; then - if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then - array_deps_required+=( glibc.i686 libstdc++64.i686 ) - else + if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "nc" ]&&[ "${engine}" != "renderware" ]; then + if [ "${distroname}" == *"Amazon Linux AMI"* ]; then + array_deps_required+=( glibc.i686 libstdc++64.i686 ) + else array_deps_required+=( glibc.i686 libstdc++.i686 ) fi fi # Game Specific requirements - # Natural Selection 2 - if [ "${gamename}" == "Natural Selection 2" ]; then + # Natural Selection 2 (x64 only) + if [ "${shortname}" == "ns2" ]; then array_deps_required+=( speex tbb ) # NS2: Combat - elif [ "${gamename}" == "NS2: Combat" ]; then + elif [ "${shortname}" == "ns2c" ]; then array_deps_required+=( speex.i686 tbb.i686 ) # 7 Days to Die - elif [ "${gamename}" == "7 Days To Die" ]; then + elif [ "${shortname}" == "sdtd" ]; then array_deps_required+=( telnet expect ) - # No More Room in Hell, Counter-Strike: Source and Garry's Mod - elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]||[ "${gamename}" == "Zombie Panic! Source" ]; then + # No More Room in Hell, Counter-Strike: Source, Garry's Mod and Zombie Panic: Source + elif [ "${shortname}" == "nmrih" ]||[ "${shortname}" == "css" ]||[ "${shortname}" == "gmod" ]||[ "${shortname}" == "zps" ]; then array_deps_required+=( ncurses-libs.i686 ) # Brainbread 2, Don't Starve Together & Team Fortress 2 - elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]||[ "${gamename}" == "Team Fortress 2" ]; then + elif [ "${shortname}" == "bb2" ]||[ "${shortname}" == "dst" ]||[ "${shortname}" == "tf2" ]; then array_deps_required+=( libcurl.i686 ) if [ "${gamename}" == "Team Fortress 2" ]; then array_deps_required+=( gperftools-libs.i686 ) fi # Battlefield: 1942 - elif [ "${gamename}" == "Battlefield: 1942" ]; then + elif [ "${shortname}" == "bf1942" ]; then array_deps_required+=( ncurses-libs.i686 ) # Call of Duty - elif [ "${gamename}" == "Call of Duty" ]||[ "${gamename}" == "Call of Duty: United Offensive" ]||[ "${gamename}" == "Call of Duty 2" ]; then + elif [ "${shortname}" == "cod" ]||[ "${shortname}" == "coduo" ]||[ "${shortname}" == "cod2" ]; then array_deps_required+=( compat-libstdc++-33.i686 ) # Factorio - elif [ "${gamename}" == "Factorio" ]; then + elif [ "${shortname}" == "fctr" ]; then array_deps_required+=( xz ) - elif [ "${gamename}" == "Hurtword" ]||[ "${gamename}" == "Rust" ]; then + elif [ "${shortname}" == "hw" ]||[ "${shortname}" == "rust" ]; then array_deps_required+=( zlib-devel ) # Minecraft elif [ "${shortname}" == "mc" ]; then javaversion=$(java -version 2>&1 | grep "version") - if [ -n "${javaversion}" ]; then + if [ "${javaversion}" ]; then javacheck=1 # Added for users using Oracle JRE to bypass the check. - array_deps_required+=( java-1.8.0-openjdk ) + array_deps_required+=( rng-tools ) else array_deps_required+=( java-1.8.0-openjdk rng-tools ) fi - # Project Zomboid - elif [ "${engine}" == "projectzomboid" ]||[ "${engine}" == "lwjgl2" ]; then + # Project Zomboid & Minecraft + elif [ "${shortname}" == "pz" ]; then javaversion=$(java -version 2>&1 | grep "version") - if [ -n "${javaversion}" ]; then + if [ "${javaversion}" ]; then javacheck=1 # Added for users using Oracle JRE to bypass the check. + array_deps_required+=( rng-tools ) else array_deps_required+=( java-1.8.0-openjdk rng-tools ) fi # GoldenEye: Source - elif [ "${gamename}" == "GoldenEye: Source" ]; then + elif [ "${shortname}" == "ges" ]; then array_deps_required+=( zlib.i686 openldap.i686 ) # Unreal Engine - elif [ "${executable}" == "./ucc-bin" ]; then + elif [ "${executable}" == "./ucc-bin" ]; then #UT2K4 if [ -f "${executabledir}/ut2004-bin" ]; then array_deps_required+=( compat-libstdc++-33.i686 SDL.i686 bzip2 ) @@ -401,12 +405,28 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]||[ -n "$(command -v dnf 2>/dev/null) array_deps_required+=( SDL.i686 bzip2 ) fi # Unreal Tournament - elif [ "${gamename}" == "Unreal Tournament" ]; then + elif [ "${shortname}" == "ut" ]; then array_deps_required+=( unzip ) # Eco - elif [ "${gamename}" == "Eco" ]; then + elif [ "${shortname}" == "eco" ]; then array_deps_required+=( mono-complete ) fi fn_deps_email fn_check_loop +} + +if [ "${function_selfname}" == "command_install.sh" ]; then + echo "" + echo "Checking Dependencies" + echo "=================================" fi + +# Filter checking in to Debian or Red Hat Based +info_distro.sh +if [ -f "/etc/debian_version" ]; then + fn_deps_build_debian +elif [ -f "/etc/redhat-release" ]; then + fn_deps_build_redhat +else + fn_print_warning_nl "${distroname} dependency checking unavailable" +fi \ No newline at end of file From b281c65c59e81b11ce1b7320b409d620882074b7 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 11:32:27 +0100 Subject: [PATCH 169/395] Further improvements to handling of mono --- lgsm/functions/check_deps.sh | 104 +++++++++++++++++++++++------------ 1 file changed, 70 insertions(+), 34 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 842872c76..32e530b54 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -22,42 +22,77 @@ fn_add_mono_repo(){ sleep 1 echo -en " \r" if [ "${distroid}" == "ubuntu" ]; then - cmd="sudo apt-key adv --keyserver http://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb http://download.mono-project.com/repo/ubuntu stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt-get update" - eval ${cmd} + if [ "${distroversion}" == "18.04" ]; then + cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/ubuntu stable-bionic main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" + eval ${cmd} + elif [ "${distroversion}" == "16.04" ]; then + cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-xenial main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" + eval ${cmd} + elif [ "${distroversion}" == "14.04" ]; then + cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-trusty main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" + eval ${cmd} + else + echo "Mono auto install not available for ${distroname}" + echo " Follow instructions on mono site to install latest version of Mono" + echo " https://www.mono-project.com/download/stable/#download-lin" + echo "" + monoautoinstall="1" + fi elif [ "${distroid}" == "debian" ]; then - cmd="sudo apt install apt-transport-https dirmngr; sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb https://download.mono-project.com/repo/debian stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt update" - eval ${cmd} + if [ "${distroversion}" == "9" ]; then + cmd="sudo apt install apt-transport-https dirmngr;sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;echo 'deb https://download.mono-project.com/repo/debian stable-stretch main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" + eval ${cmd} + elif [ "${distroversion}" == "8" ]; then + cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/debian stable-jessie main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" + eval ${cmd} + else + echo "Mono auto install not available for ${distroname}" + echo " Follow instructions on mono site to install latest version of Mono" + echo " https://www.mono-project.com/download/stable/#download-lin" + echo "" + monoautoinstall="1" + fi elif [ "${distroid}" == "centos" ]; then - cmd="rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos${distroversion}-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" - eval ${cmd} + if [ "${distroversion}" == "7" ]; then + cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" + eval ${cmd} + elif [ "${distroversion}" == "6" ]; then + cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF';su -c 'curl https://download.mono-project.com/repo/centos6-stable.repo | tee /etc/yum.repos.d/mono-centos6-stable.repo'" + eval ${cmd} + else + echo "Mono auto install not available for ${distroname}" + echo " Follow instructions on mono site to install latest version of Mono" + echo " https://www.mono-project.com/download/stable/#download-lin" + echo "" + monoautoinstall="1" + fi elif [ "${distroid}" == "fedora" ]; then cmd="rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'; su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'; dnf update" eval ${cmd} - fi - if [ $? != 0 ]; then - fn_print_failure_nl "Unable to add Mono repository" - fn_script_log_fatal "Unable to add Mono repository" - monoautoinstall=1 else - fn_print_complete_nl "Add Mono repository completed" - fn_script_log_pass "Add Mono repository completed" - monoautoinstall=0 + echo "Mono auto install not available for ${distroname}" + echo " Follow instructions on mono site to install latest version of Mono" + echo " https://www.mono-project.com/download/stable/#download-lin" + echo "" + monoautoinstall="1" fi - fi - sudo -v > /dev/null 2>&1 - if [ $? -eq 0 ]; then + if [ "${monoautoinstall}" -ne "1" ];then + if [ $? != 0 ]; then + fn_print_failure_nl "Unable to add Mono repository" + fn_script_log_fatal "Unable to add Mono repository" + monoautoinstall=1 + else + fn_print_complete_nl "Add Mono repository completed" + fn_script_log_pass "Add Mono repository completed" + monoautoinstall=0 + fi + fi + else echo "" fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Mono repository." fn_script_log_warn "$(whoami) does not have sudo access. Manually add Mono repository." - if [ "${distroid}" == "ubuntu" ]; then - echo " sudo apt-key adv --keyserver http://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb http://download.mono-project.com/repo/ubuntu stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt-get update" - elif [ "${distroid}" == "debian" ]; then - echo " sudo apt install apt-transport-https dirmngr; sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; echo 'deb https://download.mono-project.com/repo/debian stable-${distrocodename} main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list; sudo apt update" - elif [ "${distroid}" == "centos" ]; then - echo " rpm --import 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF' && su -c 'curl https://download.mono-project.com/repo/centos${distroversion}-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'" - elif [ "${distroid}" == "fedora" ]; then - echo " rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF'; su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'; dnf update" - fi + echo " Follow instructions on mono site to install latest version of Mono" + echo " https://www.mono-project.com/download/stable/#download-lin" echo "" fi fi @@ -76,14 +111,15 @@ fn_deps_detector(){ deptocheck="${javaversion}" unset javacheck elif [ "${deptocheck}" == "mono-complete" ]; then - if [ "$(command -v mono 2>/dev/null)" && "$(mono --version 2>&1) | grep -Po '(?<=version )\d')" -ge 5 ]; then - # Mono >= 5.0.0 already installed - depstatus=0 - else - # Mono not installed or installed Mono < 5.0.0 - depstatus=1 - monostatus=1 - fi + + if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then + # Mono >= 5.0.0 already installed + depstatus=0 + else + # Mono not installed or installed Mono < 5.0.0 + depstatus=1 + monostatus=1 + fi elif [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed' depstatus=$? From 29a60619d4a8c949e62ca22c982ffbcd9075b0cd Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 15:56:06 +0100 Subject: [PATCH 170/395] Added "No fixes required" message --- lgsm/functions/fix.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index 4b4ce1b76..e67a0ab3f 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -71,17 +71,20 @@ if [ "${function_selfname}" == "command_install.sh" ]; then echo "Applying ${gamename} Server Fixes" echo "=================================" sleep 0.5 - if [ "${gamename}" == "Killing Floor" ]; then - fix_kf.sh - elif [ "${gamename}" == "Killing Floor 2" ]; then - fix_kf2.sh - elif [ "${gamename}" == "Red Orchestra: Ostfront 41-45" ]; then - fix_ro.sh - elif [ "${gamename}" == "Unreal Tournament 2004" ]; then - fix_ut2k4.sh - elif [ "${gamename}" == "Unreal Tournament" ]; then - fix_ut.sh - elif [ "${gamename}" == "Unreal Tournament 3" ]; then - fix_ut3.sh - fi + if [ "${gamename}" == "Killing Floor" ]; then + fix_kf.sh + elif [ "${gamename}" == "Killing Floor 2" ]; then + fix_kf2.sh + elif [ "${gamename}" == "Red Orchestra: Ostfront 41-45" ]; then + fix_ro.sh + elif [ "${gamename}" == "Unreal Tournament 2004" ]; then + fix_ut2k4.sh + elif [ "${gamename}" == "Unreal Tournament" ]; then + fix_ut.sh + elif [ "${gamename}" == "Unreal Tournament 3" ]; then + fix_ut3.sh + else + fn_print_information "No fixes required." + fi + fi From d13e8281afe94784d7b9abd4a6bcc36c52ccee53 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 15:56:34 +0100 Subject: [PATCH 171/395] Tidy up display messages and speed up check --- lgsm/functions/check_deps.sh | 93 ++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 36 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 32e530b54..de321b2fb 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -6,13 +6,13 @@ local commandname="CHECK" -fn_add_mono_repo(){ +fn_install_mono_repo(){ if [ "${monostatus}" != "0" ]; then - fn_print_dots_nl "Adding Mono repository" + fn_print_dots "Adding Mono repository" sleep 0.5 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then - fn_print_information_nl "Automatically adding Mono repository." + fn_print_info_nl "Automatically adding Mono repository." fn_script_log_info "Automatically adding Mono repository." echo -en ".\r" sleep 1 @@ -32,10 +32,10 @@ fn_add_mono_repo(){ cmd="sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF;sudo apt install apt-transport-https;echo 'deb https://download.mono-project.com/repo/ubuntu stable-trusty main' | sudo tee /etc/apt/sources.list.d/mono-official-stable.list;sudo apt update" eval ${cmd} else + fn_print_warn_nl "Installing Mono repository" echo "Mono auto install not available for ${distroname}" - echo " Follow instructions on mono site to install latest version of Mono" + echo " Follow instructions on mono site to install the latest version of Mono." echo " https://www.mono-project.com/download/stable/#download-lin" - echo "" monoautoinstall="1" fi elif [ "${distroid}" == "debian" ]; then @@ -47,9 +47,8 @@ fn_add_mono_repo(){ eval ${cmd} else echo "Mono auto install not available for ${distroname}" - echo " Follow instructions on mono site to install latest version of Mono" + echo " Follow instructions on mono site to install the latest version of Mono." echo " https://www.mono-project.com/download/stable/#download-lin" - echo "" monoautoinstall="1" fi elif [ "${distroid}" == "centos" ]; then @@ -61,9 +60,8 @@ fn_add_mono_repo(){ eval ${cmd} else echo "Mono auto install not available for ${distroname}" - echo " Follow instructions on mono site to install latest version of Mono" + echo " Follow instructions on mono site to install the latest version of Mono." echo " https://www.mono-project.com/download/stable/#download-lin" - echo "" monoautoinstall="1" fi elif [ "${distroid}" == "fedora" ]; then @@ -71,29 +69,28 @@ fn_add_mono_repo(){ eval ${cmd} else echo "Mono auto install not available for ${distroname}" - echo " Follow instructions on mono site to install latest version of Mono" + echo " Follow instructions on mono site to install the latest version of Mono." echo " https://www.mono-project.com/download/stable/#download-lin" - echo "" monoautoinstall="1" fi - if [ "${monoautoinstall}" -ne "1" ];then + if [ "${monoautoinstall}" != "1" ];then if [ $? != 0 ]; then - fn_print_failure_nl "Unable to add Mono repository" - fn_script_log_fatal "Unable to add Mono repository" + fn_print_failure_nl "Unable to install Mono repository." + fn_script_log_fatal "Unable to installMono repository." monoautoinstall=1 else - fn_print_complete_nl "Add Mono repository completed" - fn_script_log_pass "Add Mono repository completed" + fn_print_complete_nl "Installing Mono repository completed." + fn_script_log_pass "Installing Mono repository completed." monoautoinstall=0 fi fi else + fn_print_information_nl "Installing Mono repository" echo "" - fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Mono repository." - fn_script_log_warn "$(whoami) does not have sudo access. Manually add Mono repository." - echo " Follow instructions on mono site to install latest version of Mono" + fn_print_warning_nl "$(whoami) does not have sudo access. Manually install Mono repository." + fn_script_log_warn "$(whoami) does not have sudo access. Manually install Mono repository." + echo " Follow instructions on mono site to install the latest version of Mono." echo " https://www.mono-project.com/download/stable/#download-lin" - echo "" fi fi } @@ -111,15 +108,14 @@ fn_deps_detector(){ deptocheck="${javaversion}" unset javacheck elif [ "${deptocheck}" == "mono-complete" ]; then - - if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then - # Mono >= 5.0.0 already installed - depstatus=0 - else - # Mono not installed or installed Mono < 5.0.0 - depstatus=1 - monostatus=1 - fi + if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then + # Mono >= 5.0.0 already installed + depstatus=0 + else + # Mono not installed or installed Mono < 5.0.0 + depstatus=1 + monostatus=1 + fi elif [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then dpkg-query -W -f='${Status}' "${deptocheck}" 2>/dev/null | grep -q -P '^install ok installed' depstatus=$? @@ -133,14 +129,17 @@ fn_deps_detector(){ missingdep=0 if [ "${function_selfname}" == "command_install.sh" ]; then echo -e "${green}${deptocheck}${default}" - sleep 0.5 + sleep 0.2 fi else # if dependency is not found missingdep=1 if [ "${function_selfname}" == "command_install.sh" ]; then echo -e "${red}${deptocheck}${default}" - sleep 0.5 + sleep 0.2 + fi + if [ "${deptocheck}" == "glibc.i686" ]||[ "${deptocheck}" == "libstdc++64.i686" ]||[ "${deptocheck}" == "lib32gcc1" ]||[ "${deptocheck}" == "libstdc++6:i386" ]; then + steamcmdfail=1 fi fi @@ -181,7 +180,7 @@ fn_found_missing_deps(){ fn_script_log_error "Checking dependencies: missing: ${array_deps_missing[@]}" sleep 0.5 if [ -n "${monostatus}" ]; then - fn_add_mono_repo + fn_install_mono_repo fi sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then @@ -207,6 +206,22 @@ fn_found_missing_deps(){ if [ $? != 0 ]; then fn_print_failure_nl "Unable to install dependencies" fn_script_log_fatal "Unable to install dependencies" + echo "" + fn_print_warning_nl "Manually install dependencies." + fn_script_log_warn "Manually install dependencies." + if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then + echo " sudo dpkg --add-architecture i386; sudo apt update; sudo apt install ${array_deps_missing[@]}" + elif [ -n "$(command -v dnf 2>/dev/null)" ]; then + echo " sudo dnf install ${array_deps_missing[@]}" + elif [ -n "$(command -v yum 2>/dev/null)" ]; then + echo " sudo yum install ${array_deps_missing[@]}" + fi + if [ "${steamcmdfail}" ]; then + echo "" + fn_print_failure_nl "Missing dependencies required to run SteamCMD." + fn_script_log_fatal "Missing dependencies required to run SteamCMD." + core_exit.sh + fi else fn_print_complete_nl "Install dependencies completed" fn_script_log_pass "Install dependencies completed" @@ -222,6 +237,12 @@ fn_found_missing_deps(){ elif [ -n "$(command -v yum 2>/dev/null)" ]; then echo " sudo yum install ${array_deps_missing[@]}" fi + if [ "${steamcmdfail}" ]; then + echo "" + fn_print_failure_nl "Missing dependencies required to run SteamCMD." + fn_script_log_fatal "Missing dependencies required to run SteamCMD." + core_exit.sh + fi echo "" fi if [ "${function_selfname}" == "command_install.sh" ]; then @@ -355,7 +376,7 @@ fn_deps_build_redhat(){ array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc ) elif [ "${distroid}" == "fedora" ]; then array_deps_required=( curl wget util-linux python2 file gzip bzip2 unzip binutils bc ) - elif [ "${distroname}" == *"Amazon Linux AMI"* ]; then + elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then array_deps_required=( curl wget util-linux python27 file gzip bzip2 unzip binutils bc ) else array_deps_required=( curl wget util-linux python file gzip bzip2 unzip binutils bc ) @@ -372,9 +393,9 @@ fn_deps_build_redhat(){ # All servers except ts3,mumble,multitheftauto and minecraft servers require glibc.i686 and libstdc++.i686 if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "nc" ]&&[ "${engine}" != "renderware" ]; then - if [ "${distroname}" == *"Amazon Linux AMI"* ]; then - array_deps_required+=( glibc.i686 libstdc++64.i686 ) - else + if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then + array_deps_required+=( glibc.i686 libstdc++64.i686 ) + else array_deps_required+=( glibc.i686 libstdc++.i686 ) fi fi From 062ca4236ce589779f4a6672ecbf0815ecba143f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:07:09 +0100 Subject: [PATCH 172/395] SC2168: 'local' is only valid in functions. --- lgsm/functions/alert_email.sh | 2 +- lgsm/functions/alert_ifttt.sh | 2 +- lgsm/functions/alert_mailgun.sh | 2 +- lgsm/functions/alert_pushbullet.sh | 2 +- lgsm/functions/alert_pushover.sh | 2 +- lgsm/functions/alert_telegram.sh | 2 +- lgsm/functions/check_config.sh | 2 +- lgsm/functions/check_executable.sh | 2 +- lgsm/functions/check_ip.sh | 2 +- lgsm/functions/check_logs.sh | 2 +- lgsm/functions/check_root.sh | 2 +- lgsm/functions/check_status.sh | 2 +- lgsm/functions/check_system_dir.sh | 2 +- lgsm/functions/check_system_requirements.sh | 2 +- lgsm/functions/command_backup.sh | 2 +- lgsm/functions/command_console.sh | 2 +- lgsm/functions/command_debug.sh | 2 +- lgsm/functions/command_details.sh | 2 +- lgsm/functions/command_dev_debug.sh | 2 +- lgsm/functions/command_dev_detect_deps.sh | 2 +- lgsm/functions/command_dev_detect_glibc.sh | 2 +- lgsm/functions/command_dev_detect_ldd.sh | 2 +- lgsm/functions/command_dev_query_raw.sh | 2 +- lgsm/functions/command_fastdl.sh | 2 +- lgsm/functions/command_install.sh | 2 +- lgsm/functions/command_install_resources_mta.sh | 2 +- lgsm/functions/command_mods_install.sh | 2 +- lgsm/functions/command_mods_remove.sh | 2 +- lgsm/functions/command_mods_update.sh | 2 +- lgsm/functions/command_monitor.sh | 2 +- lgsm/functions/command_postdetails.sh | 2 +- lgsm/functions/command_restart.sh | 2 +- lgsm/functions/command_start.sh | 4 ++-- lgsm/functions/command_stop.sh | 2 +- lgsm/functions/command_test_alert.sh | 2 +- lgsm/functions/command_ts3_server_pass.sh | 2 +- lgsm/functions/command_update.sh | 2 +- lgsm/functions/command_update_linuxgsm.sh | 2 +- lgsm/functions/command_validate.sh | 2 +- lgsm/functions/command_wipe.sh | 2 +- lgsm/functions/compress_unreal2_maps.sh | 2 +- lgsm/functions/compress_ut99_maps.sh | 2 +- lgsm/functions/core_dl.sh | 2 +- lgsm/functions/core_getopt.sh | 2 +- lgsm/functions/fix_arma3.sh | 2 +- lgsm/functions/fix_csgo.sh | 2 +- lgsm/functions/fix_dst.sh | 2 +- lgsm/functions/fix_glibc.sh | 2 +- lgsm/functions/fix_kf.sh | 2 +- lgsm/functions/fix_kf2.sh | 2 +- lgsm/functions/fix_mta.sh | 2 +- lgsm/functions/fix_ro.sh | 2 +- lgsm/functions/fix_ss3.sh | 2 +- lgsm/functions/fix_steamcmd.sh | 2 +- lgsm/functions/fix_ut.sh | 2 +- lgsm/functions/fix_ut2k4.sh | 2 +- lgsm/functions/fix_ut3.sh | 2 +- lgsm/functions/info_config.sh | 2 +- lgsm/functions/info_distro.sh | 2 +- lgsm/functions/info_glibc.sh | 2 +- lgsm/functions/info_parms.sh | 2 +- lgsm/functions/install_complete.sh | 2 +- lgsm/functions/install_config.sh | 2 +- lgsm/functions/install_dst_token.sh | 2 +- lgsm/functions/install_gslt.sh | 2 +- lgsm/functions/install_header.sh | 2 +- lgsm/functions/install_logs.sh | 2 +- lgsm/functions/install_mta_resources.sh | 2 +- lgsm/functions/install_retry.sh | 2 +- lgsm/functions/install_server_dir.sh | 2 +- lgsm/functions/install_server_files.sh | 2 +- lgsm/functions/install_squad_license.sh | 2 +- lgsm/functions/install_ts3db.sh | 2 +- lgsm/functions/install_ut2k4_key.sh | 2 +- lgsm/functions/mods_core.sh | 2 +- lgsm/functions/mods_list.sh | 2 +- lgsm/functions/update_factorio.sh | 2 +- lgsm/functions/update_minecraft.sh | 2 +- lgsm/functions/update_mta.sh | 2 +- lgsm/functions/update_mumble.sh | 2 +- lgsm/functions/update_steamcmd.sh | 2 +- lgsm/functions/update_ts3.sh | 2 +- 82 files changed, 83 insertions(+), 83 deletions(-) diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index d3db30319..c7c09b5e4 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -6,7 +6,7 @@ local commandname="ALERT" local commandaction="Alert" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Sending Email alert: ${email}" sleep 0.5 diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh index 07c99dda6..bf94cb8a3 100644 --- a/lgsm/functions/alert_ifttt.sh +++ b/lgsm/functions/alert_ifttt.sh @@ -6,7 +6,7 @@ local commandname="ALERT" local commandaction="Alert" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" json=$(cat </dev/null)" ]; then diff --git a/lgsm/functions/fix_steamcmd.sh b/lgsm/functions/fix_steamcmd.sh index 3a63b1505..47be4c8bf 100644 --- a/lgsm/functions/fix_steamcmd.sh +++ b/lgsm/functions/fix_steamcmd.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam,or a local steamclient.so. if [ ! -f "${HOME}/.steam/sdk32/steamclient.so" ]; then diff --git a/lgsm/functions/fix_ut.sh b/lgsm/functions/fix_ut.sh index aaaad40cb..2007fd131 100644 --- a/lgsm/functions/fix_ut.sh +++ b/lgsm/functions/fix_ut.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" #Set Binary Executable echo "chmod +x ${executabledir}/${executable}" diff --git a/lgsm/functions/fix_ut2k4.sh b/lgsm/functions/fix_ut2k4.sh index b29b312c3..88f73d9fb 100644 --- a/lgsm/functions/fix_ut2k4.sh +++ b/lgsm/functions/fix_ut2k4.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "applying WebAdmin ut2003.css fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13" diff --git a/lgsm/functions/fix_ut3.sh b/lgsm/functions/fix_ut3.sh index 217140432..113aeba99 100644 --- a/lgsm/functions/fix_ut3.sh +++ b/lgsm/functions/fix_ut3.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_parms(){ parms="server VCTF-Suspense?Game=UTGameContent.UTVehicleCTFGame_Content?bIsDedicated=true?bIsLanMatch=false?bUsesStats=false?bShouldAdvertise=false?PureServer=1?bAllowJoinInProgress=true?ConfigSubDir=${servicename} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog}" diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index b9ef232ff..4efad1a9e 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -5,7 +5,7 @@ # Website: https://linuxgsm.com # Description: Gets specific details from config files. -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" ## Examples of filtering to get info from config files # sed 's/foo//g' - remove foo diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index f8434ef1e..cd3f4b6ee 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -5,7 +5,7 @@ # Description: Variables providing useful info on the Operating System such as disk and performace info. # Used for command_details.sh, command_debug.sh and alert.sh. -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" ### Distro information diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 6d2ca4f20..f04148c49 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -4,7 +4,7 @@ # Website: https://linuxgsm.com # Description: Stores details on servers Glibc requirements. -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ "${gamename}" == "ARK: Survival Evolved" ]; then glibcrequired="2.15" diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index f1ecf21f7..1047cae2b 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -4,7 +4,7 @@ # Website: https://linuxgsm.com # Description: If specific parms are not set then this will be displayed in details. -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" ## Examples of filtering to get info from config files # sed 's/foo//g' - remove foo diff --git a/lgsm/functions/install_complete.sh b/lgsm/functions/install_complete.sh index 9712a6bc8..da99725ba 100644 --- a/lgsm/functions/install_complete.sh +++ b/lgsm/functions/install_complete.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "=================================" echo "Install Complete!" diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 28f8a954d..5320d5de9 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Checks if server cfg dir exists, creates it if it doesn't fn_check_cfgdir(){ diff --git a/lgsm/functions/install_dst_token.sh b/lgsm/functions/install_dst_token.sh index 11a4c3679..5cc7993d3 100644 --- a/lgsm/functions/install_dst_token.sh +++ b/lgsm/functions/install_dst_token.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Enter ${gamename} Cluster Token" diff --git a/lgsm/functions/install_gslt.sh b/lgsm/functions/install_gslt.sh index ab1ea7dca..67b72515c 100644 --- a/lgsm/functions/install_gslt.sh +++ b/lgsm/functions/install_gslt.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Game Server Login Token" diff --git a/lgsm/functions/install_header.sh b/lgsm/functions/install_header.sh index cae416547..56fd34705 100644 --- a/lgsm/functions/install_header.sh +++ b/lgsm/functions/install_header.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" clear echo "=================================" diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index acd6a6917..4ee3541c2 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ "${checklogs}" != "1" ]; then echo "" diff --git a/lgsm/functions/install_mta_resources.sh b/lgsm/functions/install_mta_resources.sh index b4ff2bece..cb6a77f6f 100644 --- a/lgsm/functions/install_mta_resources.sh +++ b/lgsm/functions/install_mta_resources.sh @@ -7,7 +7,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_information_nl "${gamename} will not function without resources!" echo " * install default resources using ./${selfname} install-default-resources" diff --git a/lgsm/functions/install_retry.sh b/lgsm/functions/install_retry.sh index e2918c268..96df1759c 100644 --- a/lgsm/functions/install_retry.sh +++ b/lgsm/functions/install_retry.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if fn_prompt_yn "Retry install?" Y; then command_install.sh; exit diff --git a/lgsm/functions/install_server_dir.sh b/lgsm/functions/install_server_dir.sh index abb8f6fb0..64485a889 100644 --- a/lgsm/functions/install_server_dir.sh +++ b/lgsm/functions/install_server_dir.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Server Directory" diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 31a2ece03..0508c2793 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_install_server_files(){ if [ "${gamename}" == "Battlefield: 1942" ]; then diff --git a/lgsm/functions/install_squad_license.sh b/lgsm/functions/install_squad_license.sh index 3b0711309..87124ee3e 100644 --- a/lgsm/functions/install_squad_license.sh +++ b/lgsm/functions/install_squad_license.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Squad Server License" diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 701b8c5ad..83ec249b9 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -7,7 +7,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_install_ts3db_mariadb(){ echo "" diff --git a/lgsm/functions/install_ut2k4_key.sh b/lgsm/functions/install_ut2k4_key.sh index f1e840462..bbe6af936 100644 --- a/lgsm/functions/install_ut2k4_key.sh +++ b/lgsm/functions/install_ut2k4_key.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Enter ${gamename} CD Key" diff --git a/lgsm/functions/mods_core.sh b/lgsm/functions/mods_core.sh index c53ad7c96..5d7bd7730 100644 --- a/lgsm/functions/mods_core.sh +++ b/lgsm/functions/mods_core.sh @@ -7,7 +7,7 @@ local commandname="MODS" local commandaction="addons/mods" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Files and Directories modsdir="${lgsmdir}/mods" diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index 659878d28..01d10e8be 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -10,7 +10,7 @@ local commandname="MODS" local commandaction="List Mods" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Get a proper URL for mods that don't provide a good one (optional) fn_script_log_info "Retrieving latest mods URLs" diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh index ca70396e8..5e83ddda1 100644 --- a/lgsm/functions/update_factorio.sh +++ b/lgsm/functions/update_factorio.sh @@ -7,7 +7,7 @@ local commandname="UPDATE" local commandaction="Update" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_factorio_dl(){ fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index 88ee6cebc..ae19061cf 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_dl(){ fn_fetch_file "https://s3.amazonaws.com/Minecraft.Download/versions/${availablebuild}/minecraft_server.${availablebuild}.jar" "${tmpdir}" "minecraft_server.${availablebuild}.jar" diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh index 1a4bb4419..a6cbb872c 100644 --- a/lgsm/functions/update_mta.sh +++ b/lgsm/functions/update_mta.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_mta_dl(){ fn_fetch_file "http://linux.mtasa.com/dl/${numversion}/multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh index 3ad1c1a47..2c783f211 100644 --- a/lgsm/functions/update_mumble.sh +++ b/lgsm/functions/update_mumble.sh @@ -7,7 +7,7 @@ local commandname="UPDATE" local commandaction="Update" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_mumble_dl(){ fn_fetch_file "https://github.com/mumble-voip/mumble/releases/download/${availablebuild}/murmur-static_${mumblearch}-${availablebuild}.tar.bz2" "${tmpdir}" "murmur-static_${mumblearch}-${availablebuild}.tar.bz2" diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index b60adbc53..55b6b6e79 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" check.sh diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index 596979348..3a1382c2f 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_ts3_dl(){ fn_fetch_file "http://dl.4players.de/ts/releases/${ts3_version_number}/teamspeak3-server_linux_${ts3arch}-${ts3_version_number}.tar.bz2" "${tmpdir}" "teamspeak3-server_linux_${ts3arch}-${ts3_version_number}.tar.bz2" From 99bce621f1d97e14fcfd04728c31ee4c6e722a9b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:07:20 +0100 Subject: [PATCH 173/395] SC2006: Use $(..) instead of legacy `..`. --- lgsm/config-default/config-lgsm/sdtdserver/_default.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg index 5be127534..240617558 100644 --- a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg @@ -13,7 +13,7 @@ ip="0.0.0.0" ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters fn_parms(){ -parms="-logfile ${gamelogdir}/output_log__`date +%Y-%m-%d__%H-%M-%S`.txt -quit -batchmode -nographics -dedicated -configfile=${servercfgfullpath}" +parms="-logfile ${gamelogdir}/output_log__$(date +%Y-%m-%d__%H-%M-%S).txt -quit -batchmode -nographics -dedicated -configfile=${servercfgfullpath}" } #### LinuxGSM Settings #### @@ -58,7 +58,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" From 685f51623ca0d3b493e2c85169a79f0ac5c986b9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:09:06 +0100 Subject: [PATCH 174/395] SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. --- lgsm/functions/install_ts3db.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 83ec249b9..09dac54b5 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -14,8 +14,8 @@ fn_install_ts3db_mariadb(){ echo "checking if libmariadb2 is installed" echo "=================================" sleep 0.5 - ldd "${serverfiles}/libts3db_mariadb.so" | grep "libmariadb.so.2 => not found" - if [ $? -eq 0 ]; then + + if ldd "${serverfiles}/libts3db_mariadb.so" | grep "libmariadb.so.2 => not found" echo "libmariadb2 not installed. Please install it first." echo "exiting..." exit From 6a8edd356f23aca19c5a2d34c90074943c609b56 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:10:17 +0100 Subject: [PATCH 175/395] SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. --- lgsm/functions/install_logs.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index 4ee3541c2..d0f2c3ba1 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -16,8 +16,8 @@ fi sleep 0.5 # Create LinuxGSM logs echo -ne "installing log dir: ${logdir}..." -mkdir -p "${logdir}" -if [ $? -ne 0 ]; then + +if mkdir -p "${logdir}" fn_print_fail_eol_nl core_exit.sh else @@ -25,8 +25,8 @@ else fi echo -ne "installing LinuxGSM log dir: ${lgsmlogdir}..." -mkdir -p "${lgsmlogdir}" -if [ $? -ne 0 ]; then + +if mkdir -p "${lgsmlogdir}" fn_print_fail_eol_nl core_exit.sh else @@ -63,8 +63,7 @@ fi # Create Game logs if [ -n "${gamelogdir}" ]&&[ ! -d "${gamelogdir}" ]; then echo -ne "installing game log dir: ${gamelogdir}..." - mkdir -p "${gamelogdir}" - if [ $? -ne 0 ]; then + if mkdir -p "${gamelogdir}" fn_print_fail_eol_nl core_exit.sh else @@ -79,8 +78,7 @@ fi if [ -n "${gamelogdir}" ]; then if [ "${gamelogdir:0:${#logdir}}" != "${logdir}" ]; then echo -ne "creating symlink to game log dir: ${logdir}/server -> ${gamelogdir}..." - ln -nfs "${gamelogdir}" "${logdir}/server" - if [ $? -ne 0 ]; then + if ln -nfs "${gamelogdir}" "${logdir}/server" fn_print_fail_eol_nl core_exit.sh else From 2fb2d343736a5ee4855162a1aa50b00f286838ff Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:18:19 +0100 Subject: [PATCH 176/395] Shellcheck --- lgsm/functions/install_logs.sh | 4 ++-- lgsm/functions/install_ts3db.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index d0f2c3ba1..b962017ef 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -33,8 +33,8 @@ else fn_print_ok_eol_nl fi echo -ne "creating LinuxGSM log: ${lgsmlog}..." -touch "${lgsmlog}" -if [ $? -ne 0 ]; then + +if touch "${lgsmlog}"; then fn_print_fail_eol_nl core_exit.sh else diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 09dac54b5..434d46179 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -15,7 +15,7 @@ fn_install_ts3db_mariadb(){ echo "=================================" sleep 0.5 - if ldd "${serverfiles}/libts3db_mariadb.so" | grep "libmariadb.so.2 => not found" + if ldd "${serverfiles}/libts3db_mariadb.so" | grep "libmariadb.so.2 => not found"; then echo "libmariadb2 not installed. Please install it first." echo "exiting..." exit From aaa971c0adb8308fd9c6677404ccb121f2c91cae Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:20:30 +0100 Subject: [PATCH 177/395] SC2168: 'local' is only valid in functions. --- lgsm/functions/alert.sh | 4 ++-- lgsm/functions/alert_email.sh | 4 ++-- lgsm/functions/alert_ifttt.sh | 4 ++-- lgsm/functions/alert_mailgun.sh | 4 ++-- lgsm/functions/alert_pushbullet.sh | 4 ++-- lgsm/functions/alert_pushover.sh | 4 ++-- lgsm/functions/alert_telegram.sh | 4 ++-- lgsm/functions/check.sh | 2 +- lgsm/functions/check_config.sh | 2 +- lgsm/functions/check_deps.sh | 2 +- lgsm/functions/check_executable.sh | 2 +- lgsm/functions/check_glibc.sh | 2 +- lgsm/functions/check_ip.sh | 2 +- lgsm/functions/check_logs.sh | 2 +- lgsm/functions/check_permissions.sh | 2 +- lgsm/functions/check_root.sh | 2 +- lgsm/functions/check_status.sh | 2 +- lgsm/functions/check_steamcmd.sh | 2 +- lgsm/functions/check_system_dir.sh | 2 +- lgsm/functions/check_system_requirements.sh | 2 +- lgsm/functions/check_tmuxception.sh | 2 +- lgsm/functions/command_backup.sh | 4 ++-- lgsm/functions/command_console.sh | 4 ++-- lgsm/functions/command_debug.sh | 4 ++-- lgsm/functions/command_details.sh | 4 ++-- lgsm/functions/command_dev_debug.sh | 4 ++-- lgsm/functions/command_dev_detect_deps.sh | 4 ++-- lgsm/functions/command_dev_detect_glibc.sh | 4 ++-- lgsm/functions/command_dev_detect_ldd.sh | 4 ++-- lgsm/functions/command_dev_query_raw.sh | 4 ++-- lgsm/functions/command_fastdl.sh | 4 ++-- lgsm/functions/command_install.sh | 4 ++-- lgsm/functions/command_install_resources_mta.sh | 4 ++-- lgsm/functions/command_mods_install.sh | 4 ++-- lgsm/functions/command_mods_remove.sh | 4 ++-- lgsm/functions/command_mods_update.sh | 4 ++-- lgsm/functions/command_monitor.sh | 4 ++-- lgsm/functions/command_postdetails.sh | 4 ++-- lgsm/functions/command_restart.sh | 4 ++-- lgsm/functions/command_start.sh | 4 ++-- lgsm/functions/command_stop.sh | 4 ++-- lgsm/functions/command_test_alert.sh | 4 ++-- lgsm/functions/command_ts3_server_pass.sh | 4 ++-- lgsm/functions/command_update.sh | 4 ++-- lgsm/functions/command_update_linuxgsm.sh | 4 ++-- lgsm/functions/command_validate.sh | 4 ++-- lgsm/functions/command_wipe.sh | 4 ++-- lgsm/functions/compress_unreal2_maps.sh | 2 +- lgsm/functions/compress_ut99_maps.sh | 2 +- lgsm/functions/core_dl.sh | 4 ++-- lgsm/functions/fix.sh | 4 ++-- lgsm/functions/fix_arma3.sh | 4 ++-- lgsm/functions/fix_coduo.sh | 4 ++-- lgsm/functions/fix_csgo.sh | 4 ++-- lgsm/functions/fix_dst.sh | 4 ++-- lgsm/functions/fix_ges.sh | 4 ++-- lgsm/functions/fix_glibc.sh | 4 ++-- lgsm/functions/fix_ins.sh | 4 ++-- lgsm/functions/fix_kf.sh | 4 ++-- lgsm/functions/fix_kf2.sh | 4 ++-- lgsm/functions/fix_mta.sh | 4 ++-- lgsm/functions/fix_ro.sh | 4 ++-- lgsm/functions/fix_rust.sh | 4 ++-- lgsm/functions/fix_rw.sh | 4 ++-- lgsm/functions/fix_ss3.sh | 4 ++-- lgsm/functions/fix_steamcmd.sh | 4 ++-- lgsm/functions/fix_ut.sh | 4 ++-- lgsm/functions/fix_ut2k4.sh | 4 ++-- lgsm/functions/fix_ut3.sh | 4 ++-- lgsm/functions/install_complete.sh | 4 ++-- lgsm/functions/install_config.sh | 4 ++-- lgsm/functions/install_dst_token.sh | 4 ++-- lgsm/functions/install_factorio_save.sh | 4 ++-- lgsm/functions/install_gslt.sh | 4 ++-- lgsm/functions/install_header.sh | 4 ++-- lgsm/functions/install_logs.sh | 4 ++-- lgsm/functions/install_mta_resources.sh | 4 ++-- lgsm/functions/install_retry.sh | 4 ++-- lgsm/functions/install_server_dir.sh | 4 ++-- lgsm/functions/install_server_files.sh | 4 ++-- lgsm/functions/install_squad_license.sh | 4 ++-- lgsm/functions/install_steamcmd.sh | 4 ++-- lgsm/functions/install_ts3db.sh | 4 ++-- lgsm/functions/install_ut2k4_key.sh | 4 ++-- lgsm/functions/logs.sh | 4 ++-- lgsm/functions/mods_core.sh | 4 ++-- lgsm/functions/mods_list.sh | 4 ++-- lgsm/functions/update_factorio.sh | 4 ++-- lgsm/functions/update_minecraft.sh | 4 ++-- lgsm/functions/update_mta.sh | 4 ++-- lgsm/functions/update_mumble.sh | 4 ++-- lgsm/functions/update_steamcmd.sh | 4 ++-- lgsm/functions/update_ts3.sh | 4 ++-- 93 files changed, 170 insertions(+), 170 deletions(-) diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh index 07abe0fb7..5fd907e08 100644 --- a/lgsm/functions/alert.sh +++ b/lgsm/functions/alert.sh @@ -4,8 +4,8 @@ # Website: https://linuxgsm.com # Description: Overall function for managing alerts. -local commandname="ALERT" -local commandaction="Alert" +commandname="ALERT" +commandaction="Alert" fn_alert_log(){ info_distro.sh diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index c7c09b5e4..cb7e1741d 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -4,8 +4,8 @@ # Website: https://linuxgsm.com # Description: Sends email alert. -local commandname="ALERT" -local commandaction="Alert" +commandname="ALERT" +commandaction="Alert" function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Sending Email alert: ${email}" diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh index bf94cb8a3..f21c7ad1c 100644 --- a/lgsm/functions/alert_ifttt.sh +++ b/lgsm/functions/alert_ifttt.sh @@ -4,8 +4,8 @@ # Website: https://linuxgsm.com # Description: Sends IFTTT alert. -local commandname="ALERT" -local commandaction="Alert" +commandname="ALERT" +commandaction="Alert" function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" json=$(cat < Date: Wed, 18 Jul 2018 19:22:37 +0100 Subject: [PATCH 178/395] shellcheck --- lgsm/functions/install_logs.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index 91c1982c2..fae09eb72 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -17,7 +17,7 @@ sleep 0.5 # Create LinuxGSM logs echo -ne "installing log dir: ${logdir}..." -if mkdir -p "${logdir}" +if mkdir -p "${logdir}"; then fn_print_fail_eol_nl core_exit.sh else @@ -26,7 +26,7 @@ fi echo -ne "installing LinuxGSM log dir: ${lgsmlogdir}..." -if mkdir -p "${lgsmlogdir}" +if mkdir -p "${lgsmlogdir}"; then fn_print_fail_eol_nl core_exit.sh else @@ -43,16 +43,16 @@ fi # Create Console logs if [ -n "${consolelogdir}" ]; then echo -ne "installing console log dir: ${consolelogdir}..." - mkdir -p "${consolelogdir}" - if [ $? -ne 0 ]; then + + if mkdir -p "${consolelogdir}"; then fn_print_fail_eol_nl core_exit.sh else fn_print_ok_eol_nl fi echo -ne "creating console log: ${consolelog}..." - touch "${consolelog}" - if [ $? -ne 0 ]; then + + if touch "${consolelog}"; then fn_print_fail_eol_nl core_exit.sh else @@ -63,7 +63,7 @@ fi # Create Game logs if [ -n "${gamelogdir}" ]&&[ ! -d "${gamelogdir}" ]; then echo -ne "installing game log dir: ${gamelogdir}..." - if mkdir -p "${gamelogdir}" + if mkdir -p "${gamelogdir}"; then fn_print_fail_eol_nl core_exit.sh else @@ -78,7 +78,7 @@ fi if [ -n "${gamelogdir}" ]; then if [ "${gamelogdir:0:${#logdir}}" != "${logdir}" ]; then echo -ne "creating symlink to game log dir: ${logdir}/server -> ${gamelogdir}..." - if ln -nfs "${gamelogdir}" "${logdir}/server" + if ln -nfs "${gamelogdir}" "${logdir}/server"; then fn_print_fail_eol_nl core_exit.sh else @@ -91,8 +91,8 @@ fi if [ -d "${rootdir}/Steam/logs" ]; then if [ ! -L "${logdir}/steamcmd" ]; then echo -ne "creating symlink to steam log dir: ${logdir}/steamcmd -> ${rootdir}/Steam/logs..." - ln -nfs "${rootdir}/Steam/logs" "${logdir}/steamcmd" - if [ $? -ne 0 ]; then + + if ln -nfs "${rootdir}/Steam/logs" "${logdir}/steamcmd"; then fn_print_fail_eol_nl core_exit.sh else From 05b5705c3ffb1af2e6b7653615f0142e395a9694 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:24:48 +0100 Subject: [PATCH 179/395] corrected distroid --- lgsm/functions/info_distro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index cd3f4b6ee..7d11d50b6 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -56,7 +56,7 @@ do elif [ -z "${distroversion}" ];then distroversion=$(rpm -qa \*-release | grep -Ei "oracle|redhat|centos|fedora" | cut -d"-" -f3) elif [ -z "${distroid}" ];then - distroid="$(wk '{print $1;}' /etc/redhat-release)" + distroid="$(awk '{print $1}' /etc/redhat-release)" fi fi done From cd0a2143bf4f34135179c93829c60bca788806a0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:31:56 +0100 Subject: [PATCH 180/395] added local back again --- lgsm/functions/check_system_dir.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_system_dir.sh b/lgsm/functions/check_system_dir.sh index 3583433f4..7db5410db 100644 --- a/lgsm/functions/check_system_dir.sh +++ b/lgsm/functions/check_system_dir.sh @@ -5,7 +5,7 @@ # Description: Checks if systemdir/serverfiles is accessible. commandname="CHECK" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ "${function_selfname}" != "command_validate.sh" ]; then checkdir="${serverfiles}" From 616e976251cb97a0834d4655e71dc04e372e45e6 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:35:27 +0100 Subject: [PATCH 181/395] Revert "SC2168: 'local' is only valid in functions." This reverts commit aaa971c0adb8308fd9c6677404ccb121f2c91cae. --- lgsm/functions/alert.sh | 4 ++-- lgsm/functions/alert_email.sh | 4 ++-- lgsm/functions/alert_ifttt.sh | 4 ++-- lgsm/functions/alert_mailgun.sh | 4 ++-- lgsm/functions/alert_pushbullet.sh | 4 ++-- lgsm/functions/alert_pushover.sh | 4 ++-- lgsm/functions/alert_telegram.sh | 4 ++-- lgsm/functions/check.sh | 2 +- lgsm/functions/check_config.sh | 2 +- lgsm/functions/check_deps.sh | 2 +- lgsm/functions/check_executable.sh | 2 +- lgsm/functions/check_glibc.sh | 2 +- lgsm/functions/check_ip.sh | 2 +- lgsm/functions/check_logs.sh | 2 +- lgsm/functions/check_permissions.sh | 2 +- lgsm/functions/check_root.sh | 2 +- lgsm/functions/check_status.sh | 2 +- lgsm/functions/check_steamcmd.sh | 2 +- lgsm/functions/check_system_dir.sh | 4 ++-- lgsm/functions/check_system_requirements.sh | 2 +- lgsm/functions/check_tmuxception.sh | 2 +- lgsm/functions/command_backup.sh | 4 ++-- lgsm/functions/command_console.sh | 4 ++-- lgsm/functions/command_debug.sh | 4 ++-- lgsm/functions/command_details.sh | 4 ++-- lgsm/functions/command_dev_debug.sh | 4 ++-- lgsm/functions/command_dev_detect_deps.sh | 4 ++-- lgsm/functions/command_dev_detect_glibc.sh | 4 ++-- lgsm/functions/command_dev_detect_ldd.sh | 4 ++-- lgsm/functions/command_dev_query_raw.sh | 4 ++-- lgsm/functions/command_fastdl.sh | 4 ++-- lgsm/functions/command_install.sh | 4 ++-- lgsm/functions/command_install_resources_mta.sh | 4 ++-- lgsm/functions/command_mods_install.sh | 4 ++-- lgsm/functions/command_mods_remove.sh | 4 ++-- lgsm/functions/command_mods_update.sh | 4 ++-- lgsm/functions/command_monitor.sh | 4 ++-- lgsm/functions/command_postdetails.sh | 4 ++-- lgsm/functions/command_restart.sh | 4 ++-- lgsm/functions/command_start.sh | 4 ++-- lgsm/functions/command_stop.sh | 4 ++-- lgsm/functions/command_test_alert.sh | 4 ++-- lgsm/functions/command_ts3_server_pass.sh | 4 ++-- lgsm/functions/command_update.sh | 4 ++-- lgsm/functions/command_update_linuxgsm.sh | 4 ++-- lgsm/functions/command_validate.sh | 4 ++-- lgsm/functions/command_wipe.sh | 4 ++-- lgsm/functions/compress_unreal2_maps.sh | 2 +- lgsm/functions/compress_ut99_maps.sh | 2 +- lgsm/functions/core_dl.sh | 4 ++-- lgsm/functions/fix.sh | 4 ++-- lgsm/functions/fix_arma3.sh | 4 ++-- lgsm/functions/fix_coduo.sh | 4 ++-- lgsm/functions/fix_csgo.sh | 4 ++-- lgsm/functions/fix_dst.sh | 4 ++-- lgsm/functions/fix_ges.sh | 4 ++-- lgsm/functions/fix_glibc.sh | 4 ++-- lgsm/functions/fix_ins.sh | 4 ++-- lgsm/functions/fix_kf.sh | 4 ++-- lgsm/functions/fix_kf2.sh | 4 ++-- lgsm/functions/fix_mta.sh | 4 ++-- lgsm/functions/fix_ro.sh | 4 ++-- lgsm/functions/fix_rust.sh | 4 ++-- lgsm/functions/fix_rw.sh | 4 ++-- lgsm/functions/fix_ss3.sh | 4 ++-- lgsm/functions/fix_steamcmd.sh | 4 ++-- lgsm/functions/fix_ut.sh | 4 ++-- lgsm/functions/fix_ut2k4.sh | 4 ++-- lgsm/functions/fix_ut3.sh | 4 ++-- lgsm/functions/install_complete.sh | 4 ++-- lgsm/functions/install_config.sh | 4 ++-- lgsm/functions/install_dst_token.sh | 4 ++-- lgsm/functions/install_factorio_save.sh | 4 ++-- lgsm/functions/install_gslt.sh | 4 ++-- lgsm/functions/install_header.sh | 4 ++-- lgsm/functions/install_logs.sh | 4 ++-- lgsm/functions/install_mta_resources.sh | 4 ++-- lgsm/functions/install_retry.sh | 4 ++-- lgsm/functions/install_server_dir.sh | 4 ++-- lgsm/functions/install_server_files.sh | 4 ++-- lgsm/functions/install_squad_license.sh | 4 ++-- lgsm/functions/install_steamcmd.sh | 4 ++-- lgsm/functions/install_ts3db.sh | 4 ++-- lgsm/functions/install_ut2k4_key.sh | 4 ++-- lgsm/functions/logs.sh | 4 ++-- lgsm/functions/mods_core.sh | 4 ++-- lgsm/functions/mods_list.sh | 4 ++-- lgsm/functions/update_factorio.sh | 4 ++-- lgsm/functions/update_minecraft.sh | 4 ++-- lgsm/functions/update_mta.sh | 4 ++-- lgsm/functions/update_mumble.sh | 4 ++-- lgsm/functions/update_steamcmd.sh | 4 ++-- lgsm/functions/update_ts3.sh | 4 ++-- 93 files changed, 171 insertions(+), 171 deletions(-) diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh index 5fd907e08..07abe0fb7 100644 --- a/lgsm/functions/alert.sh +++ b/lgsm/functions/alert.sh @@ -4,8 +4,8 @@ # Website: https://linuxgsm.com # Description: Overall function for managing alerts. -commandname="ALERT" -commandaction="Alert" +local commandname="ALERT" +local commandaction="Alert" fn_alert_log(){ info_distro.sh diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index cb7e1741d..c7c09b5e4 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -4,8 +4,8 @@ # Website: https://linuxgsm.com # Description: Sends email alert. -commandname="ALERT" -commandaction="Alert" +local commandname="ALERT" +local commandaction="Alert" function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Sending Email alert: ${email}" diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh index f21c7ad1c..bf94cb8a3 100644 --- a/lgsm/functions/alert_ifttt.sh +++ b/lgsm/functions/alert_ifttt.sh @@ -4,8 +4,8 @@ # Website: https://linuxgsm.com # Description: Sends IFTTT alert. -commandname="ALERT" -commandaction="Alert" +local commandname="ALERT" +local commandaction="Alert" function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" json=$(cat < Date: Wed, 18 Jul 2018 19:07:09 +0100 Subject: [PATCH 182/395] Revert " SC2168: 'local' is only valid in functions." This reverts commit 062ca4236ce589779f4a6672ecbf0815ecba143f. --- lgsm/functions/alert_email.sh | 2 +- lgsm/functions/alert_ifttt.sh | 2 +- lgsm/functions/alert_mailgun.sh | 2 +- lgsm/functions/alert_pushbullet.sh | 2 +- lgsm/functions/alert_pushover.sh | 2 +- lgsm/functions/alert_telegram.sh | 2 +- lgsm/functions/check_config.sh | 2 +- lgsm/functions/check_executable.sh | 2 +- lgsm/functions/check_ip.sh | 2 +- lgsm/functions/check_logs.sh | 2 +- lgsm/functions/check_root.sh | 2 +- lgsm/functions/check_status.sh | 2 +- lgsm/functions/check_system_dir.sh | 2 +- lgsm/functions/check_system_requirements.sh | 2 +- lgsm/functions/command_backup.sh | 2 +- lgsm/functions/command_console.sh | 2 +- lgsm/functions/command_debug.sh | 2 +- lgsm/functions/command_details.sh | 2 +- lgsm/functions/command_dev_debug.sh | 2 +- lgsm/functions/command_dev_detect_deps.sh | 2 +- lgsm/functions/command_dev_detect_glibc.sh | 2 +- lgsm/functions/command_dev_detect_ldd.sh | 2 +- lgsm/functions/command_dev_query_raw.sh | 2 +- lgsm/functions/command_fastdl.sh | 2 +- lgsm/functions/command_install.sh | 2 +- lgsm/functions/command_install_resources_mta.sh | 2 +- lgsm/functions/command_mods_install.sh | 2 +- lgsm/functions/command_mods_remove.sh | 2 +- lgsm/functions/command_mods_update.sh | 2 +- lgsm/functions/command_monitor.sh | 2 +- lgsm/functions/command_postdetails.sh | 2 +- lgsm/functions/command_restart.sh | 2 +- lgsm/functions/command_start.sh | 4 ++-- lgsm/functions/command_stop.sh | 2 +- lgsm/functions/command_test_alert.sh | 2 +- lgsm/functions/command_ts3_server_pass.sh | 2 +- lgsm/functions/command_update.sh | 2 +- lgsm/functions/command_update_linuxgsm.sh | 2 +- lgsm/functions/command_validate.sh | 2 +- lgsm/functions/command_wipe.sh | 2 +- lgsm/functions/compress_unreal2_maps.sh | 2 +- lgsm/functions/compress_ut99_maps.sh | 2 +- lgsm/functions/core_dl.sh | 2 +- lgsm/functions/core_getopt.sh | 2 +- lgsm/functions/fix_arma3.sh | 2 +- lgsm/functions/fix_csgo.sh | 2 +- lgsm/functions/fix_dst.sh | 2 +- lgsm/functions/fix_glibc.sh | 2 +- lgsm/functions/fix_kf.sh | 2 +- lgsm/functions/fix_kf2.sh | 2 +- lgsm/functions/fix_mta.sh | 2 +- lgsm/functions/fix_ro.sh | 2 +- lgsm/functions/fix_ss3.sh | 2 +- lgsm/functions/fix_steamcmd.sh | 2 +- lgsm/functions/fix_ut.sh | 2 +- lgsm/functions/fix_ut2k4.sh | 2 +- lgsm/functions/fix_ut3.sh | 2 +- lgsm/functions/info_config.sh | 2 +- lgsm/functions/info_distro.sh | 2 +- lgsm/functions/info_glibc.sh | 2 +- lgsm/functions/info_parms.sh | 2 +- lgsm/functions/install_complete.sh | 2 +- lgsm/functions/install_config.sh | 2 +- lgsm/functions/install_dst_token.sh | 2 +- lgsm/functions/install_gslt.sh | 2 +- lgsm/functions/install_header.sh | 2 +- lgsm/functions/install_logs.sh | 2 +- lgsm/functions/install_mta_resources.sh | 2 +- lgsm/functions/install_retry.sh | 2 +- lgsm/functions/install_server_dir.sh | 2 +- lgsm/functions/install_server_files.sh | 2 +- lgsm/functions/install_squad_license.sh | 2 +- lgsm/functions/install_ts3db.sh | 2 +- lgsm/functions/install_ut2k4_key.sh | 2 +- lgsm/functions/mods_core.sh | 2 +- lgsm/functions/mods_list.sh | 2 +- lgsm/functions/update_factorio.sh | 2 +- lgsm/functions/update_minecraft.sh | 2 +- lgsm/functions/update_mta.sh | 2 +- lgsm/functions/update_mumble.sh | 2 +- lgsm/functions/update_steamcmd.sh | 2 +- lgsm/functions/update_ts3.sh | 2 +- 82 files changed, 83 insertions(+), 83 deletions(-) diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh index c7c09b5e4..d3db30319 100644 --- a/lgsm/functions/alert_email.sh +++ b/lgsm/functions/alert_email.sh @@ -6,7 +6,7 @@ local commandname="ALERT" local commandaction="Alert" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_dots "Sending Email alert: ${email}" sleep 0.5 diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh index bf94cb8a3..07c99dda6 100644 --- a/lgsm/functions/alert_ifttt.sh +++ b/lgsm/functions/alert_ifttt.sh @@ -6,7 +6,7 @@ local commandname="ALERT" local commandaction="Alert" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" json=$(cat </dev/null)" ]; then diff --git a/lgsm/functions/fix_steamcmd.sh b/lgsm/functions/fix_steamcmd.sh index 47be4c8bf..3a63b1505 100644 --- a/lgsm/functions/fix_steamcmd.sh +++ b/lgsm/functions/fix_steamcmd.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam,or a local steamclient.so. if [ ! -f "${HOME}/.steam/sdk32/steamclient.so" ]; then diff --git a/lgsm/functions/fix_ut.sh b/lgsm/functions/fix_ut.sh index 2007fd131..aaaad40cb 100644 --- a/lgsm/functions/fix_ut.sh +++ b/lgsm/functions/fix_ut.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" #Set Binary Executable echo "chmod +x ${executabledir}/${executable}" diff --git a/lgsm/functions/fix_ut2k4.sh b/lgsm/functions/fix_ut2k4.sh index 88f73d9fb..b29b312c3 100644 --- a/lgsm/functions/fix_ut2k4.sh +++ b/lgsm/functions/fix_ut2k4.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "applying WebAdmin ut2003.css fix." echo "http://forums.tripwireinteractive.com/showpost.php?p=585435&postcount=13" diff --git a/lgsm/functions/fix_ut3.sh b/lgsm/functions/fix_ut3.sh index 113aeba99..217140432 100644 --- a/lgsm/functions/fix_ut3.sh +++ b/lgsm/functions/fix_ut3.sh @@ -6,7 +6,7 @@ local commandname="FIX" local commandaction="Fix" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_parms(){ parms="server VCTF-Suspense?Game=UTGameContent.UTVehicleCTFGame_Content?bIsDedicated=true?bIsLanMatch=false?bUsesStats=false?bShouldAdvertise=false?PureServer=1?bAllowJoinInProgress=true?ConfigSubDir=${servicename} -port=${port} -queryport=${queryport} -multihome=${ip} -nohomedir -unattended -log=${gamelog}" diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 4efad1a9e..b9ef232ff 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -5,7 +5,7 @@ # Website: https://linuxgsm.com # Description: Gets specific details from config files. -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" ## Examples of filtering to get info from config files # sed 's/foo//g' - remove foo diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 7d11d50b6..e65ce12f0 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -5,7 +5,7 @@ # Description: Variables providing useful info on the Operating System such as disk and performace info. # Used for command_details.sh, command_debug.sh and alert.sh. -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" ### Distro information diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index f04148c49..6d2ca4f20 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -4,7 +4,7 @@ # Website: https://linuxgsm.com # Description: Stores details on servers Glibc requirements. -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ "${gamename}" == "ARK: Survival Evolved" ]; then glibcrequired="2.15" diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index 1047cae2b..f1ecf21f7 100644 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -4,7 +4,7 @@ # Website: https://linuxgsm.com # Description: If specific parms are not set then this will be displayed in details. -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" ## Examples of filtering to get info from config files # sed 's/foo//g' - remove foo diff --git a/lgsm/functions/install_complete.sh b/lgsm/functions/install_complete.sh index da99725ba..9712a6bc8 100644 --- a/lgsm/functions/install_complete.sh +++ b/lgsm/functions/install_complete.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "=================================" echo "Install Complete!" diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 5320d5de9..28f8a954d 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Checks if server cfg dir exists, creates it if it doesn't fn_check_cfgdir(){ diff --git a/lgsm/functions/install_dst_token.sh b/lgsm/functions/install_dst_token.sh index 5cc7993d3..11a4c3679 100644 --- a/lgsm/functions/install_dst_token.sh +++ b/lgsm/functions/install_dst_token.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Enter ${gamename} Cluster Token" diff --git a/lgsm/functions/install_gslt.sh b/lgsm/functions/install_gslt.sh index 67b72515c..ab1ea7dca 100644 --- a/lgsm/functions/install_gslt.sh +++ b/lgsm/functions/install_gslt.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Game Server Login Token" diff --git a/lgsm/functions/install_header.sh b/lgsm/functions/install_header.sh index 56fd34705..cae416547 100644 --- a/lgsm/functions/install_header.sh +++ b/lgsm/functions/install_header.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" clear echo "=================================" diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index f5b73030b..335623b61 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if [ "${checklogs}" != "1" ]; then echo "" diff --git a/lgsm/functions/install_mta_resources.sh b/lgsm/functions/install_mta_resources.sh index cb6a77f6f..b4ff2bece 100644 --- a/lgsm/functions/install_mta_resources.sh +++ b/lgsm/functions/install_mta_resources.sh @@ -7,7 +7,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_print_information_nl "${gamename} will not function without resources!" echo " * install default resources using ./${selfname} install-default-resources" diff --git a/lgsm/functions/install_retry.sh b/lgsm/functions/install_retry.sh index 96df1759c..e2918c268 100644 --- a/lgsm/functions/install_retry.sh +++ b/lgsm/functions/install_retry.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" if fn_prompt_yn "Retry install?" Y; then command_install.sh; exit diff --git a/lgsm/functions/install_server_dir.sh b/lgsm/functions/install_server_dir.sh index 64485a889..abb8f6fb0 100644 --- a/lgsm/functions/install_server_dir.sh +++ b/lgsm/functions/install_server_dir.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Server Directory" diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 0508c2793..31a2ece03 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_install_server_files(){ if [ "${gamename}" == "Battlefield: 1942" ]; then diff --git a/lgsm/functions/install_squad_license.sh b/lgsm/functions/install_squad_license.sh index 87124ee3e..3b0711309 100644 --- a/lgsm/functions/install_squad_license.sh +++ b/lgsm/functions/install_squad_license.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Squad Server License" diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh index 434d46179..ebb23c052 100644 --- a/lgsm/functions/install_ts3db.sh +++ b/lgsm/functions/install_ts3db.sh @@ -7,7 +7,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_install_ts3db_mariadb(){ echo "" diff --git a/lgsm/functions/install_ut2k4_key.sh b/lgsm/functions/install_ut2k4_key.sh index bbe6af936..f1e840462 100644 --- a/lgsm/functions/install_ut2k4_key.sh +++ b/lgsm/functions/install_ut2k4_key.sh @@ -6,7 +6,7 @@ local commandname="INSTALL" local commandaction="Install" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" echo "" echo "Enter ${gamename} CD Key" diff --git a/lgsm/functions/mods_core.sh b/lgsm/functions/mods_core.sh index 5d7bd7730..c53ad7c96 100644 --- a/lgsm/functions/mods_core.sh +++ b/lgsm/functions/mods_core.sh @@ -7,7 +7,7 @@ local commandname="MODS" local commandaction="addons/mods" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Files and Directories modsdir="${lgsmdir}/mods" diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index 01d10e8be..659878d28 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -10,7 +10,7 @@ local commandname="MODS" local commandaction="List Mods" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" # Get a proper URL for mods that don't provide a good one (optional) fn_script_log_info "Retrieving latest mods URLs" diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh index 5e83ddda1..ca70396e8 100644 --- a/lgsm/functions/update_factorio.sh +++ b/lgsm/functions/update_factorio.sh @@ -7,7 +7,7 @@ local commandname="UPDATE" local commandaction="Update" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_factorio_dl(){ fn_fetch_file "https://www.factorio.com/get-download/${availablebuild}/headless/${factorioarch}" "${tmpdir}" "factorio_headless_${factorioarch}-${availablebuild}.tar.gz" diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index ae19061cf..88ee6cebc 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_dl(){ fn_fetch_file "https://s3.amazonaws.com/Minecraft.Download/versions/${availablebuild}/minecraft_server.${availablebuild}.jar" "${tmpdir}" "minecraft_server.${availablebuild}.jar" diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh index a6cbb872c..1a4bb4419 100644 --- a/lgsm/functions/update_mta.sh +++ b/lgsm/functions/update_mta.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_mta_dl(){ fn_fetch_file "http://linux.mtasa.com/dl/${numversion}/multitheftauto_linux_x64-${fullversion}.tar.gz" "${tmpdir}" "multitheftauto_linux_x64-${fullversion}.tar.gz" diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh index 2c783f211..3ad1c1a47 100644 --- a/lgsm/functions/update_mumble.sh +++ b/lgsm/functions/update_mumble.sh @@ -7,7 +7,7 @@ local commandname="UPDATE" local commandaction="Update" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_mumble_dl(){ fn_fetch_file "https://github.com/mumble-voip/mumble/releases/download/${availablebuild}/murmur-static_${mumblearch}-${availablebuild}.tar.bz2" "${tmpdir}" "murmur-static_${mumblearch}-${availablebuild}.tar.bz2" diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index 55b6b6e79..b60adbc53 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" check.sh diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index 3a1382c2f..596979348 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -6,7 +6,7 @@ local commandname="UPDATE" local commandaction="Update" -function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" +local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_ts3_dl(){ fn_fetch_file "http://dl.4players.de/ts/releases/${ts3_version_number}/teamspeak3-server_linux_${ts3arch}-${ts3_version_number}.tar.bz2" "${tmpdir}" "teamspeak3-server_linux_${ts3arch}-${ts3_version_number}.tar.bz2" From 4d6d22692b47e0556688e55ae60c516051f2db3c Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 19:48:07 +0100 Subject: [PATCH 183/395] Revert Logs --- lgsm/functions/install_logs.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh index 335623b61..acd6a6917 100644 --- a/lgsm/functions/install_logs.sh +++ b/lgsm/functions/install_logs.sh @@ -16,8 +16,8 @@ fi sleep 0.5 # Create LinuxGSM logs echo -ne "installing log dir: ${logdir}..." - -if mkdir -p "${logdir}"; then +mkdir -p "${logdir}" +if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else @@ -25,16 +25,16 @@ else fi echo -ne "installing LinuxGSM log dir: ${lgsmlogdir}..." - -if mkdir -p "${lgsmlogdir}"; then +mkdir -p "${lgsmlogdir}" +if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else fn_print_ok_eol_nl fi echo -ne "creating LinuxGSM log: ${lgsmlog}..." - -if touch "${lgsmlog}"; then +touch "${lgsmlog}" +if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else @@ -43,16 +43,16 @@ fi # Create Console logs if [ -n "${consolelogdir}" ]; then echo -ne "installing console log dir: ${consolelogdir}..." - - if mkdir -p "${consolelogdir}"; then + mkdir -p "${consolelogdir}" + if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else fn_print_ok_eol_nl fi echo -ne "creating console log: ${consolelog}..." - - if touch "${consolelog}"; then + touch "${consolelog}" + if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else @@ -63,7 +63,8 @@ fi # Create Game logs if [ -n "${gamelogdir}" ]&&[ ! -d "${gamelogdir}" ]; then echo -ne "installing game log dir: ${gamelogdir}..." - if mkdir -p "${gamelogdir}"; then + mkdir -p "${gamelogdir}" + if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else @@ -78,7 +79,8 @@ fi if [ -n "${gamelogdir}" ]; then if [ "${gamelogdir:0:${#logdir}}" != "${logdir}" ]; then echo -ne "creating symlink to game log dir: ${logdir}/server -> ${gamelogdir}..." - if ln -nfs "${gamelogdir}" "${logdir}/server"; then + ln -nfs "${gamelogdir}" "${logdir}/server" + if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else @@ -91,8 +93,8 @@ fi if [ -d "${rootdir}/Steam/logs" ]; then if [ ! -L "${logdir}/steamcmd" ]; then echo -ne "creating symlink to steam log dir: ${logdir}/steamcmd -> ${rootdir}/Steam/logs..." - - if ln -nfs "${rootdir}/Steam/logs" "${logdir}/steamcmd"; then + ln -nfs "${rootdir}/Steam/logs" "${logdir}/steamcmd" + if [ $? -ne 0 ]; then fn_print_fail_eol_nl core_exit.sh else From 16f46a0cb3bb3c0ace83f9c3201cc3f4a02aa41f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 20:37:03 +0100 Subject: [PATCH 184/395] missing quotes --- lgsm/functions/info_distro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index e65ce12f0..37adc0a19 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -155,7 +155,7 @@ if [ -d "${backupdir}" ]; then backupcount=0 # If there are backups in backup dir. - if [ $(find "${backupdir}" -name "*.tar.gz" | wc -l) -ne "0" ]; then + if [ "$(find "${backupdir}" -name "*.tar.gz" | wc -l)" -ne "0" ]; then # number of backups. backupcount=$(find "${backupdir}"/*.tar.gz | wc -l) # most recent backup. From b6e6239ff8cf3cbc0993ad94d2783622ced08e7b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 20:37:37 +0100 Subject: [PATCH 185/395] spaces --- lgsm/functions/check_ip.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index a054bf6a0..2be87cef3 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -14,8 +14,8 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi else ipcommand="ip" fi - getip=$(${ipcommand} -o -4 addr|awk '{print $4}'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|sort -u|grep -v 127.0.0) - getipwc=$(${ipcommand} -o -4 addr|awk '{print $4}'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|sort -u|grep -vc 127.0.0) + getip=$(${ipcommand} -o -4 addr | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|sort -u|grep -v 127.0.0) + getipwc=$(${ipcommand} -o -4 addr | awk '{print $4}' | grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|sort -u|grep -vc 127.0.0) info_config.sh info_parms.sh From 77ea1ca2fd25b15b1866f77bfb494e4c24970879 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 18 Jul 2018 20:45:02 +0100 Subject: [PATCH 186/395] updated version number --- linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index 9e59cfd9a..5d792aac8 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="180409" +version="180718" shortname="core" gameservername="core" rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" From 41fcb84f492ba5b7b1852e4a21b9872dda99e1c0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 20 Jul 2018 20:48:12 +0100 Subject: [PATCH 187/395] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 27 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 17 ++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..dd3d413bf --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,27 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. +Follow **[this guide](https://linuxgsm.com/support/#guide)** to make sure you post the correct info. +For general support visit the **[steam group](https://linuxgsm.com/steam)**. + +**To Reproduce** +Steps to reproduce the behaviour: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behaviour** +A clear and concise description of what you expected to happen. + +** Minimum Information ** +The game server you are running (e.g. Rust/CS:GO). +The link from `./gameserver postdetails` command. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..066b2d920 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 1a713a5cca943f7957037d17c555ae581a6eb0ad Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 20 Jul 2018 20:51:27 +0100 Subject: [PATCH 188/395] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 18 ++++++++++++++++-- .github/ISSUE_TEMPLATE/feature_request.md | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index dd3d413bf..f69856e5f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,11 +4,25 @@ about: Create a report to help us improve --- -**Describe the bug** -A clear and concise description of what the bug is. Follow **[this guide](https://linuxgsm.com/support/#guide)** to make sure you post the correct info. For general support visit the **[steam group](https://linuxgsm.com/steam)**. +GitHub is **ONLY** for: +* LinuxGSM bugs +* feature suggestions +* code contributions + +GitHub is **NOT** for: +* General support +* Specific game server issues (e.g CS:GO, TF2) +* Dedicated server issues (e.g Ubuntu, CentOS) +* Anything not directly related to LinuxGSM development + +Any general support issues on GitHub will be closed. + +**Describe the bug** +A clear and concise description of what the bug is. + **To Reproduce** Steps to reproduce the behaviour: 1. Go to '...' diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 066b2d920..54d5b552a 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,6 +4,21 @@ about: Suggest an idea for this project --- +Follow **[this guide](https://linuxgsm.com/support/#guide)** to make sure you post the correct info. +For general support visit the **[steam group](https://linuxgsm.com/steam)**. + +GitHub is **ONLY** for: +* LinuxGSM bugs +* feature suggestions +* code contributions + +GitHub is **NOT** for: +* General support +* Specific game server issues (e.g CS:GO, TF2) +* Dedicated server issues (e.g Ubuntu, CentOS) +* Anything not directly related to LinuxGSM development + +Any general support issues on GitHub will be closed. **Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] From e3ea52bf885caea00a3c023a8b8e84f3cd0dd7ba Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 20 Jul 2018 20:59:40 +0100 Subject: [PATCH 189/395] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.md | 1 + .github/ISSUE_TEMPLATE/new-server-request.md | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/new-server-request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 54d5b552a..6ba0c2bd2 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -19,6 +19,7 @@ GitHub is **NOT** for: * Anything not directly related to LinuxGSM development Any general support issues on GitHub will be closed. + **Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] diff --git a/.github/ISSUE_TEMPLATE/new-server-request.md b/.github/ISSUE_TEMPLATE/new-server-request.md new file mode 100644 index 000000000..2029a645a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/new-server-request.md @@ -0,0 +1,16 @@ +--- +name: New Server Request +about: Suggest a new game server to be added + +--- + +**What game server Would you like adding?** + +**Can you link to any tutorials or guides?** +Any useful guides will help with development + +**Is the server on Steam?** +If yes Use SteamDB to get the appid. https://steamdb.info/ + +**Is the server supported on Linux?** +We only support Linux servers and dont support Wine. From eed04ab2fd975f4736c113b98faf167374ad26d9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 20 Jul 2018 21:00:22 +0100 Subject: [PATCH 190/395] Update issue templates --- .github/ISSUE_TEMPLATE/new-server-request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/new-server-request.md b/.github/ISSUE_TEMPLATE/new-server-request.md index 2029a645a..6ce2f50d1 100644 --- a/.github/ISSUE_TEMPLATE/new-server-request.md +++ b/.github/ISSUE_TEMPLATE/new-server-request.md @@ -1,5 +1,5 @@ --- -name: New Server Request +name: New server request about: Suggest a new game server to be added --- From 590bcb25006b43dbee4af8f0701f5e9807e71ced Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 11:04:02 +0200 Subject: [PATCH 191/395] Do not exit for details if IP is not set Fixes #1385 --- lgsm/functions/check_ip.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh index 2be87cef3..47f14de4e 100644 --- a/lgsm/functions/check_ip.sh +++ b/lgsm/functions/check_ip.sh @@ -53,8 +53,13 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi echo -en "\n" echo -en "https://linuxgsm.com/network-interfaces\n" echo -en "" - fn_script_log_fatal "https://linuxgsm.com/network-interfaces\n" - core_exit.sh + # Do not exit for details and postdetails commands + if [ "${commandaction}" != "Details" ]&&[ "${commandaction}" != "Postdetails" ]; then + fn_script_log_fatal "https://linuxgsm.com/network-interfaces\n" + core_exit.sh + else + ip="NOT SET" + fi # Single interface elif [ "${ipsetinconfig}" == "1" ]; then fn_print_fail "Check IP: IP address not set in game config." From 6271da3cb101d4b9a1ecefafb26c7cfa2ac332ab Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 11:16:14 +0200 Subject: [PATCH 192/395] Added command wipeall Related to #1830 --- lgsm/functions/core_getopt.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index d88d25d2b..5273e1826 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -35,7 +35,8 @@ cmd_mods_update=( "mu;mods-update" "command_mods_update.sh" "Update installed mo # Server specific cmd_change_password=( "pw;change-password" "command_ts3_server_pass.sh" "Change TS3 serveradmin password." ) cmd_install_default_resources=( "ir;install-default-resources" "command_install_resources_mta.sh" "Install the MTA default resources." ) -cmd_wipe=( "wi;wipe" "command_wipe.sh" "Wipe your server data." ) +cmd_wipe=( "wi;wipe" "command_wipe.sh" "Wipe your main game server data." ) +cmd_wipeall=( "fw;wipeall" "command_wipe.sh" "Wipe your game server data and blueprints." ) cmd_map_compressor_u99=( "mc;map-compressor" "compress_ut99_maps.sh" "Compresses all ${gamename} server maps." ) cmd_map_compressor_u2=( "mc;map-compressor" "compress_unreal2_maps.sh" "Compresses all ${gamename} server maps." ) cmd_install_cdkey=( "cd;server-cd-key" "install_ut2k4_key.sh" "Add your server cd key." ) @@ -93,7 +94,7 @@ fi # Unreal exclusive if [ "${gamename}" == "Rust" ]; then - currentopt+=( "${cmd_wipe[@]}" ) + currentopt+=( "${cmd_wipe[@]}" "${cmd_wipeall[@]}" ) fi if [ "${engine}" == "unreal2" ]; then if [ "${gamename}" == "Unreal Tournament 2004" ]; then From de7d264bf91d2398d2c9675845e9842ec8f193bd Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 12:12:09 +0200 Subject: [PATCH 193/395] Attempt at fixing #1949 Fixes #1949 hopefully --- lgsm/functions/command_update_linuxgsm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index 77e5ddc49..5567736b9 100644 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -43,7 +43,7 @@ if [ -z "${legacymode}" ]; then fn_print_ok_eol_nl fi echo -ne " checking ${selfname}...\c" - script_diff=$(diff <(sed '/shortname/d;/gameservername/d;/gamename/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/gameservername/d;/gamename/d' "${rootdir}/${selfname}")) + script_diff=$(diff <(sed '/shortname/d;/gameservername/d;/gamename/d;githubuser/d;githubrepo/d;githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/gameservername/d;/gamename/d;githubuser/d;githubrepo/d;githubbranch/d' "${rootdir}/${selfname}")) if [ "${script_diff}" != "" ]; then fn_print_update_eol_nl echo -ne " backup ${selfname}...\c" @@ -114,4 +114,4 @@ else fn_script_log_pass "Updating functions" fi echo -ne "\n" -core_exit.sh \ No newline at end of file +core_exit.sh From 944dadaeeff2fd6a0304c8639255a66246c7da25 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 13:01:23 +0200 Subject: [PATCH 194/395] trying out different sed separator --- lgsm/functions/command_update_linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index 5567736b9..3e46f4a4b 100644 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -43,7 +43,7 @@ if [ -z "${legacymode}" ]; then fn_print_ok_eol_nl fi echo -ne " checking ${selfname}...\c" - script_diff=$(diff <(sed '/shortname/d;/gameservername/d;/gamename/d;githubuser/d;githubrepo/d;githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/gameservername/d;/gamename/d;githubuser/d;githubrepo/d;githubbranch/d' "${rootdir}/${selfname}")) + script_diff=$(diff <(sed '@shortname@d;@gameservername@d;@gamename@d;githubuser@d;githubrepo@d;githubbranch@d' "${tmpdir}/linuxgsm.sh") <(sed '@shortname@d;@gameservername@d;@gamename@d;githubuser@d;githubrepo@d;githubbranch@d' "${rootdir}/${selfname}")) if [ "${script_diff}" != "" ]; then fn_print_update_eol_nl echo -ne " backup ${selfname}...\c" From 8b1188d8aee6e69d0d867ff6d64d758b1bf13f20 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 13:11:00 +0200 Subject: [PATCH 195/395] Fixing my blindness --- lgsm/functions/command_update_linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index 3e46f4a4b..924b3a201 100644 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -43,7 +43,7 @@ if [ -z "${legacymode}" ]; then fn_print_ok_eol_nl fi echo -ne " checking ${selfname}...\c" - script_diff=$(diff <(sed '@shortname@d;@gameservername@d;@gamename@d;githubuser@d;githubrepo@d;githubbranch@d' "${tmpdir}/linuxgsm.sh") <(sed '@shortname@d;@gameservername@d;@gamename@d;githubuser@d;githubrepo@d;githubbranch@d' "${rootdir}/${selfname}")) + script_diff=$(diff <(sed '/shortname/d;/gameservername/d;/gamename/d;githubuser/d;/githubrepo/d;/githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/gameservername/d;/gamename/d;/githubuser/d;/githubrepo/d;/githubbranch/d' "${rootdir}/${selfname}")) if [ "${script_diff}" != "" ]; then fn_print_update_eol_nl echo -ne " backup ${selfname}...\c" From 099de12356ab536712d22d5eb819ffc94b032fb1 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 13:13:08 +0200 Subject: [PATCH 196/395] fixing more blindness on horrible sed syntax --- lgsm/functions/command_update_linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index 924b3a201..cfdb9b002 100644 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -43,7 +43,7 @@ if [ -z "${legacymode}" ]; then fn_print_ok_eol_nl fi echo -ne " checking ${selfname}...\c" - script_diff=$(diff <(sed '/shortname/d;/gameservername/d;/gamename/d;githubuser/d;/githubrepo/d;/githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/gameservername/d;/gamename/d;/githubuser/d;/githubrepo/d;/githubbranch/d' "${rootdir}/${selfname}")) + script_diff=$(diff <(sed '/shortname/d;/gameservername/d;/gamename/d;/githubuser/d;/githubrepo/d;/githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/gameservername/d;/gamename/d;/githubuser/d;/githubrepo/d;/githubbranch/d' "${rootdir}/${selfname}")) if [ "${script_diff}" != "" ]; then fn_print_update_eol_nl echo -ne " backup ${selfname}...\c" From bb0ae9ae534068f514133a237f51791370ee7992 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 13:15:31 +0200 Subject: [PATCH 197/395] Now trying to fix the actual sed --- lgsm/functions/command_update_linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index cfdb9b002..de4b7e55e 100644 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -43,7 +43,7 @@ if [ -z "${legacymode}" ]; then fn_print_ok_eol_nl fi echo -ne " checking ${selfname}...\c" - script_diff=$(diff <(sed '/shortname/d;/gameservername/d;/gamename/d;/githubuser/d;/githubrepo/d;/githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/gameservername/d;/gamename/d;/githubuser/d;/githubrepo/d;/githubbranch/d' "${rootdir}/${selfname}")) + script_diff=$(diff <(sed '\/shortname/d;\/gameservername/d;/\gamename/d;\/githubuser/d;\/githubrepo/d;\/githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '\/shortname/d;\/gameservername/d;\/gamename/d;\/githubuser/d;\/githubrepo/d;\/githubbranch/d' "${rootdir}/${selfname}")) if [ "${script_diff}" != "" ]; then fn_print_update_eol_nl echo -ne " backup ${selfname}...\c" From 0faf47f0275d32147c24ca04c8608b95f96345a7 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 13:18:11 +0200 Subject: [PATCH 198/395] fixed misplaced escape -_- damn me and damn sed --- lgsm/functions/command_update_linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index de4b7e55e..56383f0ce 100644 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -43,7 +43,7 @@ if [ -z "${legacymode}" ]; then fn_print_ok_eol_nl fi echo -ne " checking ${selfname}...\c" - script_diff=$(diff <(sed '\/shortname/d;\/gameservername/d;/\gamename/d;\/githubuser/d;\/githubrepo/d;\/githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '\/shortname/d;\/gameservername/d;\/gamename/d;\/githubuser/d;\/githubrepo/d;\/githubbranch/d' "${rootdir}/${selfname}")) + script_diff=$(diff <(sed '\/shortname/d;\/gameservername/d;\/gamename/d;\/githubuser/d;\/githubrepo/d;\/githubbranch/d' "${tmpdir}/linuxgsm.sh") <(sed '\/shortname/d;\/gameservername/d;\/gamename/d;\/githubuser/d;\/githubrepo/d;\/githubbranch/d' "${rootdir}/${selfname}")) if [ "${script_diff}" != "" ]; then fn_print_update_eol_nl echo -ne " backup ${selfname}...\c" From 07e693a926b76576acca6b0d98b3a746b86c1e8a Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 14:17:27 +0200 Subject: [PATCH 199/395] added var for fullwipe --- lgsm/functions/core_getopt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index 5273e1826..a13f5affc 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -36,7 +36,7 @@ cmd_mods_update=( "mu;mods-update" "command_mods_update.sh" "Update installed mo cmd_change_password=( "pw;change-password" "command_ts3_server_pass.sh" "Change TS3 serveradmin password." ) cmd_install_default_resources=( "ir;install-default-resources" "command_install_resources_mta.sh" "Install the MTA default resources." ) cmd_wipe=( "wi;wipe" "command_wipe.sh" "Wipe your main game server data." ) -cmd_wipeall=( "fw;wipeall" "command_wipe.sh" "Wipe your game server data and blueprints." ) +cmd_wipeall=( "fw;wipeall" "fullwipe=1; command_wipe.sh" "Wipe your game server data and blueprints." ) cmd_map_compressor_u99=( "mc;map-compressor" "compress_ut99_maps.sh" "Compresses all ${gamename} server maps." ) cmd_map_compressor_u2=( "mc;map-compressor" "compress_unreal2_maps.sh" "Compresses all ${gamename} server maps." ) cmd_install_cdkey=( "cd;server-cd-key" "install_ut2k4_key.sh" "Add your server cd key." ) From f60854542e2a803743910a759c72d393ceee6b4c Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 14:18:27 +0200 Subject: [PATCH 200/395] better naming for wipe all --- lgsm/functions/core_getopt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh index a13f5affc..07b5e71f9 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -36,7 +36,7 @@ cmd_mods_update=( "mu;mods-update" "command_mods_update.sh" "Update installed mo cmd_change_password=( "pw;change-password" "command_ts3_server_pass.sh" "Change TS3 serveradmin password." ) cmd_install_default_resources=( "ir;install-default-resources" "command_install_resources_mta.sh" "Install the MTA default resources." ) cmd_wipe=( "wi;wipe" "command_wipe.sh" "Wipe your main game server data." ) -cmd_wipeall=( "fw;wipeall" "fullwipe=1; command_wipe.sh" "Wipe your game server data and blueprints." ) +cmd_wipeall=( "wa;wipeall" "wipeall=1; command_wipe.sh" "Wipe your game server data and blueprints." ) cmd_map_compressor_u99=( "mc;map-compressor" "compress_ut99_maps.sh" "Compresses all ${gamename} server maps." ) cmd_map_compressor_u2=( "mc;map-compressor" "compress_unreal2_maps.sh" "Compresses all ${gamename} server maps." ) cmd_install_cdkey=( "cd;server-cd-key" "install_ut2k4_key.sh" "Add your server cd key." ) From 1a20656197bf766413c42e37f1a4adf2097fd5bf Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 21 Jul 2018 13:21:37 +0100 Subject: [PATCH 201/395] fixes #1846 --- lgsm/config-default/config-lgsm/gmodserver/_default.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg index 090966694..07afe4cd4 100644 --- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg @@ -24,9 +24,8 @@ wsapikey="" wscollectionid="" ## Custom Start Parameters -# Default +r_hunkalloclightmaps 0, fixes a start issue on maps with many lights # Default -disableluarefresh, disables lua autorefresh reducing server lag. Auto refresh only useful for developers. -customparms="+r_hunkalloclightmaps 0 -disableluarefresh" +customparms="-disableluarefresh" ## Optional: Game Server Login Token # GSLT can be used for running a public server. From 2a8982db5a9e493f5c741acbc11c46377c26bc5e Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 14:30:53 +0200 Subject: [PATCH 202/395] Full refactor to wipe and now fits new Rust files Fixes #1830 I will test this and fix if needed --- lgsm/functions/command_wipe.sh | 110 +++++++++++++++++++++------------ 1 file changed, 71 insertions(+), 39 deletions(-) diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh index 7e38cf1ab..fc27f56f9 100644 --- a/lgsm/functions/command_wipe.sh +++ b/lgsm/functions/command_wipe.sh @@ -43,63 +43,64 @@ fn_wipe_exit_code(){ # Removes files to wipe server fn_wipe_server_remove_files(){ # Rust Wipe -#WipeProceduralSave if [ "${gamename}" == "Rust" ]; then - if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then - currentaction="Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav" - echo -en "Removing map saves proceduralmap.*.sav file(s)..." + # Wipe pocedural map + if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.map")" ]; then + currentaction="Removing map file(s): ${serveridentitydir}/proceduralmap.*.map" + echo -en "Removing procedural map proceduralmap.*.map file(s)..." sleep 0.5 fn_script_log "${currentaction}" - find "${serveridentitydir:?}" -type f -name "proceduralmap.*.sav" -delete + find "${serveridentitydir:?}" -type f -name "proceduralmap.*.map" -delete fn_wipe_exit_code sleep 0.5 else - fn_print_information_nl "No procedural map save to remove" - fn_script_log_info "No procedural map save to remove." + fn_print_information_nl "No procedural map file to remove" + fn_script_log_info "No procedural map file to remove." sleep 0.5 fi -#WipeBarrenSave - if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then - currentaction="Removing barren map save(s): ${serveridentitydir}/barren*.sav" - echo -en "Removing barren map saves barren*.sav file(s)..." + #Wipe procedural map save + if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then + currentaction="Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav" + echo -en "Removing map saves proceduralmap.*.sav file(s)..." sleep 0.5 fn_script_log "${currentaction}" - find "${serveridentitydir:?}" -type f -name "barren*.sav" -delete + find "${serveridentitydir:?}" -type f -name "proceduralmap.*.sav" -delete fn_wipe_exit_code sleep 0.5 else - fn_print_information_nl "No barren map save to remove" - fn_script_log_info "No barren map save to remove." + fn_print_information_nl "No procedural map save to remove" + fn_script_log_info "No procedural map save to remove." sleep 0.5 fi -#WipeProceduralMap - if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.map")" ]; then - currentaction="Removing map file(s): ${serveridentitydir}/proceduralmap.*.map" - echo -en "Removing procedural map proceduralmap.*.map file(s)..." + # Wipe Barren map + if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then + currentaction="Removing map file(s): ${serveridentitydir}/barren*.map" + echo -en "Removing barren map barren*.map file(s)..." sleep 0.5 fn_script_log "${currentaction}" - find "${serveridentitydir:?}" -type f -name "proceduralmap.*.map" -delete + find "${serveridentitydir:?}" -type f -name "barren*.map" -delete fn_wipe_exit_code sleep 0.5 else - fn_print_information_nl "No procedural map file to remove" - fn_script_log_info "No procedural map file to remove." + fn_print_information_nl "No barren map file to remove" + fn_script_log_info "No barren map file to remove." sleep 0.5 fi -#WipeBarrenMap - if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.map")" ]; then - currentaction="Removing map file(s): ${serveridentitydir}/barren*.map" - echo -en "Removing barren map barren*.map file(s)..." + # Wipe barren map save + if [ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]; then + currentaction="Removing barren map save(s): ${serveridentitydir}/barren*.sav" + echo -en "Removing barren map saves barren*.sav file(s)..." sleep 0.5 fn_script_log "${currentaction}" - find "${serveridentitydir:?}" -type f -name "barren*.map" -delete + find "${serveridentitydir:?}" -type f -name "barren*.sav" -delete fn_wipe_exit_code sleep 0.5 else - fn_print_information_nl "No barren map file to remove" - fn_script_log_info "No barren map file to remove." + fn_print_information_nl "No barren map save to remove" + fn_script_log_info "No barren map save to remove." sleep 0.5 fi + # Wipe user dir, might be a legacy thing, maybe to be removed if [ -d "${serveridentitydir}/user" ]; then currentaction="Removing user directory: ${serveridentitydir}/user" echo -en "Removing user directory..." @@ -108,11 +109,9 @@ fn_wipe_server_remove_files(){ rm -rf "${serveridentitydir:?}/user" fn_wipe_exit_code sleep 0.5 - else - fn_print_information_nl "No user directory to remove" - fn_script_log_info "No user directory to remove." - sleep 0.5 + # We do not print additional information if there is nothing to remove since this might be obsolete fi + # Wipe storage dir, might be a legacy thing, maybe to be removed if [ -d "${serveridentitydir}/storage" ]; then currentaction="Removing storage directory: ${serveridentitydir}/storage" echo -en "Removing storage directory..." @@ -121,11 +120,47 @@ fn_wipe_server_remove_files(){ rm -rf "${serveridentitydir:?}/storage" fn_wipe_exit_code sleep 0.5 + # We do not print additional information if there is nothing to remove since this might be obsolete + fi + # Wipe player death files + if [ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]; then + currentaction="Removing player death files: ${serveridentitydir}/player.deaths.*.db" + echo -en "Removing player deaths player.deaths.*.db file(s)..." + sleep 0.5 + fn_script_log "${currentaction}" + find "${serveridentitydir:?}" -type f -name "player.deaths.*.db" -delete + fn_wipe_exit_code + sleep 0.5 else - fn_print_information_nl "No storage directory to remove" - fn_script_log_info "No storage directory to remove." + fn_print_information_nl "No player death to remove" + fn_script_log_info "No player death to remove." sleep 0.5 fi + # Wipe blueprints only if wipeall command was used + if [ "${wipeall}" == "1" ]; then + if [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then + currentaction="Removing blueprint file(s): ${serveridentitydir}/player.blueprints.*.db" + echo -en "Removing procedural blueprints player.blueprints.*.db file(s)..." + sleep 0.5 + fn_script_log "${currentaction}" + find "${serveridentitydir:?}" -type f -name "player.blueprints.*.db" -delete + fn_wipe_exit_code + sleep 0.5 + else + fn_print_information_nl "No blueprint file to remove" + fn_script_log_info "No blueprint file to remove." + sleep 0.5 + fi + elif [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ] + fn_print_information_nl "Keeping blueprints" + fn_script_log_info "Keeping blueprints." + sleep 0.5 + else + fn_print_information_nl "No blueprints found" + fn_script_log_info "No blueprints found." + sleep 0.5 + fi + # Wipe some logs that might be there if [ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then currentaction="Removing log files: ${serveridentitydir}/Log.*.txt" echo -en "Removing Log files..." @@ -134,10 +169,7 @@ fn_wipe_server_remove_files(){ find "${serveridentitydir:?}" -type f -name "Log.*.txt" -delete fn_wipe_exit_code sleep 0.5 - else - fn_print_information_nl "No log files to remove" - fn_script_log_info "No log files to remove." - sleep 0.5 + # We do not print additional information if there are no logs to remove fi # You can add an "elif" here to add another game or engine fi @@ -146,7 +178,7 @@ fn_wipe_server_remove_files(){ # Check if there is something to wipe, prompt the user, and call appropriate functions # Rust Wipe if [ "${gamename}" == "Rust" ]; then - if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]; then + if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then fn_print_warning_nl "Any user, storage, log and map data from ${serveridentitydir} will be erased." if ! fn_prompt_yn "Continue?" Y; then echo Exiting; core_exit.sh From d209743012daf6178e91e8d4a311a65cd9c4b2e3 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 14:32:25 +0200 Subject: [PATCH 203/395] bash syntax --- lgsm/functions/command_wipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh index fc27f56f9..62374ced8 100644 --- a/lgsm/functions/command_wipe.sh +++ b/lgsm/functions/command_wipe.sh @@ -151,7 +151,7 @@ fn_wipe_server_remove_files(){ fn_script_log_info "No blueprint file to remove." sleep 0.5 fi - elif [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ] + elif [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then fn_print_information_nl "Keeping blueprints" fn_script_log_info "Keeping blueprints." sleep 0.5 From 642f13ecd33f658053a142750505d2b6ddf88a6c Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 14:34:03 +0200 Subject: [PATCH 204/395] typo --- lgsm/functions/command_wipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh index 62374ced8..abad7e1fc 100644 --- a/lgsm/functions/command_wipe.sh +++ b/lgsm/functions/command_wipe.sh @@ -140,7 +140,7 @@ fn_wipe_server_remove_files(){ if [ "${wipeall}" == "1" ]; then if [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then currentaction="Removing blueprint file(s): ${serveridentitydir}/player.blueprints.*.db" - echo -en "Removing procedural blueprints player.blueprints.*.db file(s)..." + echo -en "Removing blueprints player.blueprints.*.db file(s)..." sleep 0.5 fn_script_log "${currentaction}" find "${serveridentitydir:?}" -type f -name "player.blueprints.*.db" -delete From efc7976bc9260d25d2c250c9d1590bb41f33fadb Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 14:39:19 +0200 Subject: [PATCH 205/395] missing space on a comment critical fix ;D --- lgsm/functions/command_wipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh index abad7e1fc..b9ed70ecb 100644 --- a/lgsm/functions/command_wipe.sh +++ b/lgsm/functions/command_wipe.sh @@ -58,7 +58,7 @@ fn_wipe_server_remove_files(){ fn_script_log_info "No procedural map file to remove." sleep 0.5 fi - #Wipe procedural map save + # Wipe procedural map save if [ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap.*.sav")" ]; then currentaction="Removing procedural map save(s): ${serveridentitydir}/proceduralmap.*.sav" echo -en "Removing map saves proceduralmap.*.sav file(s)..." From 52a81d674a8cbe229509ff291bcfe2c633a6a3f0 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 14:44:49 +0200 Subject: [PATCH 206/395] Added sv.files.*.db --- lgsm/functions/command_wipe.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh index b9ed70ecb..69d0140f3 100644 --- a/lgsm/functions/command_wipe.sh +++ b/lgsm/functions/command_wipe.sh @@ -122,6 +122,17 @@ fn_wipe_server_remove_files(){ sleep 0.5 # We do not print additional information if there is nothing to remove since this might be obsolete fi + # Wipe sv.files + if [ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then + currentaction="Removing server misc files: ${serveridentitydir}/sv.files.*.db" + echo -en "Removing server misc srv.files*.db file(s)..." + sleep 0.5 + fn_script_log "${currentaction}" + find "${serveridentitydir:?}" -type f -name "sv.files.*.d" -delete + fn_wipe_exit_code + sleep 0.5 + # No further information if not found because it should I could not get this file showing up + fi # Wipe player death files if [ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]; then currentaction="Removing player death files: ${serveridentitydir}/player.deaths.*.db" @@ -178,7 +189,7 @@ fn_wipe_server_remove_files(){ # Check if there is something to wipe, prompt the user, and call appropriate functions # Rust Wipe if [ "${gamename}" == "Rust" ]; then - if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then + if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then fn_print_warning_nl "Any user, storage, log and map data from ${serveridentitydir} will be erased." if ! fn_prompt_yn "Continue?" Y; then echo Exiting; core_exit.sh From 1ca82a410eac01f4baf9e83199057fdb68865f2c Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 21 Jul 2018 15:40:11 +0200 Subject: [PATCH 207/395] Fixed wrong text in some core messages --- lgsm/functions/core_messages.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index 9ffbc52ae..7fa9dc8a6 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -315,20 +315,20 @@ fn_print_fail_eol_nl(){ # WARN fn_print_warn_eol(){ - echo -en "${red}FAIL${default}" + echo -en "${red}WARNING${default}" } fn_print_warn_eol_nl(){ - echo -e "${red}FAIL${default}" + echo -e "${red}WARNING${default}" } # INFO fn_print_info_eol(){ - echo -en "${red}FAIL${default}" + echo -en "${red}INFO${default}" } fn_print_info_eol_nl(){ - echo -e "${red}FAIL${default}" + echo -e "${red}INFO${default}" } # QUERYING From 4cc8973c2bc4c4af4d428521135e1c1a65c4976e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 21 Jul 2018 15:36:58 +0100 Subject: [PATCH 208/395] changed WARNING to WARN --- lgsm/functions/core_messages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index 7fa9dc8a6..3a47798b3 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -315,11 +315,11 @@ fn_print_fail_eol_nl(){ # WARN fn_print_warn_eol(){ - echo -en "${red}WARNING${default}" + echo -en "${red}WARN${default}" } fn_print_warn_eol_nl(){ - echo -e "${red}WARNING${default}" + echo -e "${red}WARN${default}" } # INFO From 64c07ce3d6832de5c47725f94b9b9d2e54392002 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 21 Jul 2018 15:44:06 +0100 Subject: [PATCH 209/395] Update issue templates Update issue templates Update issue templates Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 41 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 33 ++++++++++++++++ .github/ISSUE_TEMPLATE/new-server-request.md | 16 ++++++++ 3 files changed, 90 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/new-server-request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..f69856e5f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,41 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +Follow **[this guide](https://linuxgsm.com/support/#guide)** to make sure you post the correct info. +For general support visit the **[steam group](https://linuxgsm.com/steam)**. + +GitHub is **ONLY** for: +* LinuxGSM bugs +* feature suggestions +* code contributions + +GitHub is **NOT** for: +* General support +* Specific game server issues (e.g CS:GO, TF2) +* Dedicated server issues (e.g Ubuntu, CentOS) +* Anything not directly related to LinuxGSM development + +Any general support issues on GitHub will be closed. + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behaviour: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behaviour** +A clear and concise description of what you expected to happen. + +** Minimum Information ** +The game server you are running (e.g. Rust/CS:GO). +The link from `./gameserver postdetails` command. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..6ba0c2bd2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,33 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +Follow **[this guide](https://linuxgsm.com/support/#guide)** to make sure you post the correct info. +For general support visit the **[steam group](https://linuxgsm.com/steam)**. + +GitHub is **ONLY** for: +* LinuxGSM bugs +* feature suggestions +* code contributions + +GitHub is **NOT** for: +* General support +* Specific game server issues (e.g CS:GO, TF2) +* Dedicated server issues (e.g Ubuntu, CentOS) +* Anything not directly related to LinuxGSM development + +Any general support issues on GitHub will be closed. + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/new-server-request.md b/.github/ISSUE_TEMPLATE/new-server-request.md new file mode 100644 index 000000000..6ce2f50d1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/new-server-request.md @@ -0,0 +1,16 @@ +--- +name: New server request +about: Suggest a new game server to be added + +--- + +**What game server Would you like adding?** + +**Can you link to any tutorials or guides?** +Any useful guides will help with development + +**Is the server on Steam?** +If yes Use SteamDB to get the appid. https://steamdb.info/ + +**Is the server supported on Linux?** +We only support Linux servers and dont support Wine. From 9472c6759bbeb9b88a00d69656e3d2668a7a3185 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 21 Jul 2018 21:10:49 +0100 Subject: [PATCH 210/395] Hotfix/minecraft 1944 (#1954) * Minecraft updater now working after changes made by Mojang * jq is now a requirement of LinuxGSM --- .travis.yml | 1 + .../config-lgsm/mcserver/_default.cfg | 2 +- lgsm/functions/check_deps.sh | 16 +++++++++++----- lgsm/functions/update_minecraft.sh | 6 ++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5bfa204d..deadbfe64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ addons: - ca-certificates - binutils - bc + - jq - tmux - lib32gcc1 - libstdc++6 diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg index a3f973da4..92830934b 100644 --- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg @@ -89,7 +89,7 @@ engine="lwjgl2" ## Server Specific Directories systemdir="${serverfiles}" executabledir="${serverfiles}" -executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar nogui" +executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar" servercfg="server.properties" servercfgdefault="server.properties" servercfgdir="${serverfiles}" diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index de321b2fb..55085abfb 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -107,6 +107,8 @@ fn_deps_detector(){ depstatus=0 deptocheck="${javaversion}" unset javacheck + elif [ "${deptocheck}" == "jq" ]&&[ "${distroversion}" == "6" ]; then + jqstatus=1 elif [ "${deptocheck}" == "mono-complete" ]; then if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed @@ -182,6 +184,10 @@ fn_found_missing_deps(){ if [ -n "${monostatus}" ]; then fn_install_mono_repo fi + if [ -n "${jqstatus}" ]; then + fn_print_warning_nl "jq is not available in the ${distroname} repository" + echo " * https://github.com/GameServerManagers/LinuxGSM/wiki/jq" + fi sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then fn_print_information_nl "Automatically installing missing dependencies." @@ -268,7 +274,7 @@ fn_deps_build_debian(){ array_deps_missing=() ## LinuxGSM requirements - array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python bzip2 gzip unzip binutils bc ) + array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python bzip2 gzip unzip binutils bc jq ) # All servers except ts3 require tmux if [ "${shortname}" != "ts3" ]; then @@ -373,13 +379,13 @@ fn_deps_build_redhat(){ # LinuxGSM requirements ## CentOS 6 if [ "${distroversion}" == "6" ]; then - array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc ) + array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc jq ) elif [ "${distroid}" == "fedora" ]; then - array_deps_required=( curl wget util-linux python2 file gzip bzip2 unzip binutils bc ) + array_deps_required=( curl wget util-linux python2 file gzip bzip2 unzip binutils bc jq ) elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then - array_deps_required=( curl wget util-linux python27 file gzip bzip2 unzip binutils bc ) + array_deps_required=( curl wget util-linux python27 file gzip bzip2 unzip binutils bc jq ) else - array_deps_required=( curl wget util-linux python file gzip bzip2 unzip binutils bc ) + array_deps_required=( curl wget util-linux python file gzip bzip2 unzip binutils bc jq ) fi # All servers except ts3 require tmux diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index 88ee6cebc..c02fa932b 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -9,11 +9,13 @@ local commandaction="Update" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_dl(){ - fn_fetch_file "https://s3.amazonaws.com/Minecraft.Download/versions/${availablebuild}/minecraft_server.${availablebuild}.jar" "${tmpdir}" "minecraft_server.${availablebuild}.jar" + latestmcbuildurl=$(${curlpath} -s $(${curlpath} -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | jq -r '.versions[0] | .url') | jq -r '.downloads.server.url') + fn_fetch_file "${latestmcbuildurl}" "${tmpdir}" "minecraft_server.${availablebuild}.jar" echo -e "copying to ${serverfiles}...\c" fn_script_log "Copying to ${serverfiles}" cp "${tmpdir}/minecraft_server.${availablebuild}.jar" "${serverfiles}/minecraft_server.jar" local exitcode=$? + chmod u+x "${serverfiles}/minecraft_server.jar" if [ ${exitcode} -eq 0 ]; then fn_print_ok_eol_nl else @@ -69,7 +71,7 @@ fn_update_currentbuild(){ fn_update_availablebuild(){ # Gets latest build info. - availablebuild=$(${curlpath} -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | sed -e 's/^.*"release":"\([^"]*\)".*$/\1/') + availablebuild=$(${curlpath} -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | jq -r '.latest.release') # Checks if availablebuild variable has been set if [ -z "${availablebuild}" ]; then fn_print_fail "Checking for update: mojang.com" From e54790900095a8440b29d2ffe8a6f59b035696d8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 22 Jul 2018 12:26:30 +0100 Subject: [PATCH 211/395] corrected shortname for minecraft related to #1941 --- 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 55085abfb..f727d13d8 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -398,7 +398,7 @@ fn_deps_build_redhat(){ fi # All servers except ts3,mumble,multitheftauto and minecraft servers require glibc.i686 and libstdc++.i686 - if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "nc" ]&&[ "${engine}" != "renderware" ]; then + if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "mumble" ]&&[ "${shortname}" != "mc" ]&&[ "${engine}" != "renderware" ]; then if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then array_deps_required+=( glibc.i686 libstdc++64.i686 ) else From 49599ed65823a6de064aeb4b7335c6bd02641a6d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Mon, 23 Jul 2018 23:11:14 +0200 Subject: [PATCH 212/395] Only check steam dependencies for steam games related to #1941 --- lgsm/functions/check_deps.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index f727d13d8..5db883072 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -140,8 +140,11 @@ fn_deps_detector(){ echo -e "${red}${deptocheck}${default}" sleep 0.2 fi - if [ "${deptocheck}" == "glibc.i686" ]||[ "${deptocheck}" == "libstdc++64.i686" ]||[ "${deptocheck}" == "lib32gcc1" ]||[ "${deptocheck}" == "libstdc++6:i386" ]; then - steamcmdfail=1 + # Define required dependencies for SteamCMD + if [ -n "${appid}" ]; then + if [ "${deptocheck}" == "glibc.i686" ]||[ "${deptocheck}" == "libstdc++64.i686" ]||[ "${deptocheck}" == "lib32gcc1" ]||[ "${deptocheck}" == "libstdc++6:i386" ]; then + steamcmdfail=1 + fi fi fi @@ -492,4 +495,4 @@ elif [ -f "/etc/redhat-release" ]; then fn_deps_build_redhat else fn_print_warning_nl "${distroname} dependency checking unavailable" -fi \ No newline at end of file +fi From fc2c83f1ea13ff4dcfb3202557d8bc8e7287431e Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 26 Jul 2018 01:10:19 +0200 Subject: [PATCH 213/395] Reliable way to select latest Minecraft release fixes #1961 --- lgsm/functions/update_minecraft.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index c02fa932b..947de934a 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -9,7 +9,8 @@ local commandaction="Update" local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" fn_update_dl(){ - latestmcbuildurl=$(${curlpath} -s $(${curlpath} -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | jq -r '.versions[0] | .url') | jq -r '.downloads.server.url') + latestmcreleaselink=$(${curlpath} -s "https://launchermeta.mojang.com/mc/game/version_manifest.json" | jq -r '.latest.release as $latest | .versions[] | select(.id == $latest) | .url') + latestmcbuildurl=$(${curlpath} -s "${latestmcreleaselink}" | jq -r '.downloads.server.url') fn_fetch_file "${latestmcbuildurl}" "${tmpdir}" "minecraft_server.${availablebuild}.jar" echo -e "copying to ${serverfiles}...\c" fn_script_log "Copying to ${serverfiles}" From aa4daf17c27afd5ab5c98d18bbd6bb71870a3e35 Mon Sep 17 00:00:00 2001 From: Bara Date: Sat, 4 Aug 2018 10:15:05 +0200 Subject: [PATCH 214/395] Update license year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c6ad3cd89..9bcd64251 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Daniel Gibbs +Copyright (c) 2018 Daniel Gibbs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 6e778e856eed11419feb14f530283592d2bf270b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 10 Aug 2018 17:32:24 +0100 Subject: [PATCH 215/395] Post Scriptum (#1981) * [Server Request] Postscriptum #1911 * Altered check_system_requirements.sh to use shortname * Changed wording of Glibc Required in debug * Rearranged code * fixed steamcmd glibc detection --- .../config-lgsm/pstbsserver/_default.cfg | 131 ++++++++++++++++++ lgsm/data/serverlist.csv | 1 + lgsm/functions/check_system_requirements.sh | 13 +- lgsm/functions/command_debug.sh | 2 +- lgsm/functions/fix.sh | 2 +- lgsm/functions/info_config.sh | 35 ++++- lgsm/functions/info_glibc.sh | 5 +- lgsm/functions/info_messages.sh | 14 +- 8 files changed, 193 insertions(+), 10 deletions(-) create mode 100644 lgsm/config-default/config-lgsm/pstbsserver/_default.cfg diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg new file mode 100644 index 000000000..ef6550d5f --- /dev/null +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -0,0 +1,131 @@ +################################## +######## Default Settings ######## +################################## +# DO NOT EDIT WILL BE OVERWRITTEN! +# Copy settings from here and use them in either +# common.cfg - applies settings to every instance +# [instance].cfg - applies settings to a specific instance + +#### Server Settings #### + +## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters + +ip="0.0.0.0" +randommap="ALWAYS" +port="10027" +queryport="10037" +#servername="LinuxGSM server" +# If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number. +maxplayers="40" +numreservedslots="2" + +## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters +fn_parms(){ +parms="MULTIHOME=${ip}?RANDOM=${randommap}?Port=${port}?QueryPort=${queryport}?MaxPlayers=${maxplayers}?NumReservedSlots=${numreservedslots}" +} + +#### LinuxGSM Settings #### + +## Notification Alerts +# (on|off) + +# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info +postalert="off" +postdays="7" +posttarget="https://hastebin.com" + +# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord +discordalert="off" +discordwebhook="webhook" + +# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email +emailalert="off" +email="email@example.com" +emailfrom="" + +# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT +iftttalert="off" +ifttttoken="accesstoken" +iftttevent="linuxgsm_alert" + +# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun +mailgunalert="off" +mailguntoken="accesstoken" +mailgundomain="example.com" +mailgunemailfrom="alert@example.com" +mailgunemail="email@myemail.com" + +# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet +pushbulletalert="off" +pushbullettoken="accesstoken" +channeltag="" + +# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover +pushoveralert="off" +pushovertoken="accesstoken" + +# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram +# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# any custom string in curl - simple ignore this parameter. +telegramalert="off" +telegramtoken="accesstoken" +telegramchatid="" +curlcustomstring="" + +## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update +updateonstart="off" + +## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" + +## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging +consolelogging="on" +logdays="7" + +#### LinuxGSM Advanced Settings #### + +## SteamCMD Settings +# Server appid +appid="746200" +# Steam App Branch Select +# Allows to opt into the various Steam app branches. Default branch is "". +# Example: "-beta latest_experimental" +branch="" + +## LinuxGSM Server Details +# Do not edit +gamename="pstbsserver" +engine="unreal4" + +#### Directories #### +# Edit with care + +## Server Specific Directories +systemdir="${serverfiles}/PostScriptum" +executabledir="${serverfiles}" +executable="./PostScriptumServer.sh" +servercfg="Server.cfg" +servercfgdefault="Server.cfg" +servercfgdir="${systemdir}/ServerConfig" +servercfgfullpath="${servercfgdir}/${servercfg}" + +## Backup Directory +backupdir="${lgsmdir}/backup" + +## Logging Directories +logdir="${rootdir}/log" +gamelogdir="${systemdir}/Saved/Logs" +lgsmlogdir="${logdir}/script" +consolelogdir="${logdir}/console" +gamelog="${gamelogdir}/${servicename}-game.log" +lgsmlog="${lgsmlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +alertlog="${lgsmlogdir}/${servicename}-alert.log" +postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" + +## Logs Naming +lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv index 6f0a9efcb..962cd77b6 100644 --- a/lgsm/data/serverlist.csv +++ b/lgsm/data/serverlist.csv @@ -50,6 +50,7 @@ ns,nsserver,Natural Selection ns2,ns2server,Natural Selection 2 ns2c,ns2cserver,NS2: Combat opfor,opforserver,Opposing Force +pstbs,pstbsserver,Post Scriptum: The Bloody Seventh pvkii,pvkiiserver,Pirates Vikings & Knights II pc,pcserver,Project Cars pz,pzserver,Project Zomboid diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh index e0a3dbd01..ce961548d 100644 --- a/lgsm/functions/check_system_requirements.sh +++ b/lgsm/functions/check_system_requirements.sh @@ -12,19 +12,22 @@ info_distro.sh # RAM requirements in megabytes for each game or engine. -if [ "${gamename}" == "ARK: Survival Evolved" ]; then +if [ "${shortname}" == "ark" ]; then ramrequirementmb="4000" ramrequirementgb="4" -elif [ "${gamename}" == "ARMA 3" ]; then +elif [ "${shortname}" == "arma3" ]; then ramrequirementmb="1000" ramrequirementgb="1" -elif [ "${gamename}" == "Rust" ]; then +elif [ "${shortname}" == "rust" ]; then ramrequirementmb="4000" ramrequirementgb="4" -elif [ "${gamename}" == "Minecraft" ]; then +elif [ "${shortname}" == "mc" ]; then ramrequirementmb="1000" ramrequirementgb="1" -elif [ "${gamename}" == "Natural Selection 2" ]||[ "${gamename}" == "NS2: Combat" ]; then +elif [ "${shortname}" == "pstbs" ]; then + ramrequirementmb="2000" + ramrequirementgb="2" +elif [ "${shortname}" == "ns2" ]||[ "${shortname}" == "ns2c" ]; then ramrequirementmb="1000" ramrequirementgb="1" elif [ "${shortname}" == "st" ]; then diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh index 270d23e5f..c3d8d32d1 100644 --- a/lgsm/functions/command_debug.sh +++ b/lgsm/functions/command_debug.sh @@ -44,7 +44,7 @@ if [ -n "${glibcrequired}" ]; then if [ "${glibcfix}" == "yes" ]; then echo -e "${blue}GLIBC required:\t${red}${glibcrequired} ${default}(${green}Using GLIBC fix${default})" else - echo -e "${blue}GLIBC required:\t${red}${glibcrequired} ${default}(${red}GLIBC version too old${default})" + echo -e "${blue}GLIBC required:\t${red}${glibcrequired} ${default}(${red}GLIBC distro version ${glibcversion} too old${default})" fi else echo -e "${blue}GLIBC required:\t${green}${glibcrequired}${default}" diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index e67a0ab3f..49fd5f16f 100644 --- a/lgsm/functions/fix.sh +++ b/lgsm/functions/fix.sh @@ -84,7 +84,7 @@ if [ "${function_selfname}" == "command_install.sh" ]; then elif [ "${gamename}" == "Unreal Tournament 3" ]; then fix_ut3.sh else - fn_print_information "No fixes required." + fn_print_information_nl "No fixes required." fi fi diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index b9ef232ff..cf548f78d 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -331,6 +331,36 @@ fn_info_config_minecraft(){ fi } +#Post Scriptum: The bloody Seventh +fn_info_config_pstbs(){ + if [ ! -f "${servercfgfullpath}" ]; then + servername="${unavailable}" + maxplayers="${unavailable}" + numreservedslots="${unavailable}" + else + servername="$(grep "ServerName=" "${servercfgfullpath}" | sed -e 's/^[ \t]//g' -e '/^#/d' -e 's/ServerName//g' | tr -d '=";,:' | sed -e 's/^[ \t]//' -e 's/[ \t]*$//')" + maxplayers="$(grep "MaxPlayers=" "${servercfgfullpath}" | tr -cd '[:digit:]')" + numreservedslots="$(grep "NumReservedSlots=" "${servercfgfullpath}" | tr -cd '[:digit:]')" + fi + + if [ ! -f "${servercfgdir}/Rcon.cfg" ]; then + rconport=${unavailable} + rconpassword=${unavailable} + else + rconport=$(grep "Port=" "${servercfgdir}/Rcon.cfg" | tr -cd '[:digit:]') + rconpassword=$(grep "Password=" "${servercfgdir}/Rcon.cfg" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + fi + + rconport=${rconport:-"0"} + if [ -z "${rconpassword}" ]||[ ${#rconpassword} == 1 ]; then + rconpassword="NOT SET" + fi + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + maxplayers=${maxplayers:-"0"} + numreservedslots=${maxplayers:-"0"} +} + fn_info_config_projectcars(){ if [ ! -f "${servercfgfullpath}" ]; then servername="${unavailable}" @@ -1078,6 +1108,9 @@ elif [ "${gamename}" == "Quake Live" ]; then # Minecraft elif [ "${engine}" == "lwjgl2" ]; then fn_info_config_minecraft +# Post Scriptum: The Bloody Seventh +elif [ "${shortname}" == "pstbs" ]; then + fn_info_config_pstbs # Project Cars elif [ "${gamename}" == "Project Cars" ]; then fn_info_config_projectcars @@ -1137,4 +1170,4 @@ elif [ "${gamename}" == "Squad" ]; then # Stationeers elif [ "${gamename}" == "Stationeers" ]; then fn_info_config_stationeers -fi +fi \ No newline at end of file diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 6d2ca4f20..244b401c9 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -90,6 +90,9 @@ elif [ "${gamename}" == "Project Cars" ]; then elif [ "${gamename}" == "Pirates, Vikings, and Knights II" ]; then glibcrequired="2.15" glibcfix="yes" +elif [ "${shortname}" == "pstbs" ]; then + glibcrequired="2.17" + glibcfix="no" elif [ "${gamename}" == "Quake 2" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" @@ -205,7 +208,7 @@ fi # Sets the SteamCMD GLIBC requirement if the game server requirement is less or not required. if [ -n "${appid}" ]; then - if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ -z "${glibcrequired}" ]||[ "$(printf '%s\n'${glibcrequired}'\n' "${glibcversion}" | sort -V | head -n 1)" != "2.14" ]; then + if [ "${glibcrequired}" = "NOT REQUIRED" ]||[ -z "${glibcrequired}" ]||[ "$(printf '%s\n'${glibcrequired}'\n' "2.14" | sort -V | head -n 1)" != "2.14" ]; then glibcrequired="2.14" glibcfix="no" fi diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index a5283c2f1..c3a8509f2 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -282,7 +282,7 @@ fn_info_message_gameserver(){ echo -e "${blue}ASE:\t${default}${saveinterval} s" fi - # Random map rotation mode (Squad) + # Random map rotation mode (Squad and Post Scriptum) if [ -n "${randommap}" ]; then echo -e "${blue}Map rotation:\t${default}${randommap}" fi @@ -693,6 +693,16 @@ fn_info_message_mumble(){ echo -e "> ServerQuery\tINBOUND\t${port}\ttcp" } | column -s $'\t' -t } +fn_info_Message_pstbs(){ + echo -e "netstat -atunp | grep PostScriptum" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + echo -e "> Query\tINBOUND\t${queryport}\tudp" + echo -e "> RCON\tINBOUND\t${rconport}\ttcp" + } | column -s $'\t' -t +} fn_info_message_projectcars(){ echo -e "netstat -atunp | grep DedicatedS" @@ -1106,6 +1116,8 @@ fn_info_message_select_engine(){ fn_info_message_justcause3 elif [ "${shortname}" == "kf2" ]; then fn_info_message_kf2 + elif [ "${shortname}" == "pstbs" ]; then + fn_info_Message_pstbs elif [ "${gamename}" == "Project Cars" ]; then fn_info_message_projectcars elif [ "${gamename}" == "QuakeWorld" ]; then From 69efb4363f45901bac0217a4afbaaa3208150c73 Mon Sep 17 00:00:00 2001 From: Max Staff Date: Sun, 12 Aug 2018 00:26:17 +0200 Subject: [PATCH 216/395] Use /proc/meminfo instead of free -m (#1971) * Use /proc/meminfo instead of free -m Also uses numfmt which is included in coreutils since version 8.24. --- lgsm/functions/info_distro.sh | 36 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 37adc0a19..4842397e8 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -90,31 +90,23 @@ days=$(( uptime/60/60/24 )) load=$(uptime|awk -F 'load average: ' '{ print $2 }') ## Memory information -# Available RAM and swap. - -# Older versions of free do not support -h option. -if [ "$(free -h > /dev/null 2>&1; echo $?)" -ne "0" ]; then - humanreadable="-m" -else - humanreadable="-h" -fi -physmemtotal=$(free ${humanreadable} | awk '/Mem:/ {print $2}') -physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}') -physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}') -physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}') -oldfree=$(free ${humanreadable} | awk '/cache:/') -if [ -n "${oldfree}" ]; then +# Available RAM and swap. +physmemtotalmb=$(($(grep MemTotal /proc/meminfo | awk '{print $2}')/1024)) +physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemTotal /proc/meminfo | awk '{print $2}')K") +physmemfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')K") +physmemused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep "^MemTotal\:" /proc/meminfo | awk '{print $2}')-$(grep "^MemFree\:" /proc/meminfo | awk '{print $2}')-$(grep "^Buffers\:" /proc/meminfo | awk '{print $2}')-$(grep "^Cached\:" /proc/meminfo | awk '{print $2}')-$(grep "^SReclaimable\:" /proc/meminfo | awk '{print $2}')))K") +{ # try + physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')K") + physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^Cached /proc/meminfo | awk '{print $2}')+$(grep "^SReclaimable\:" /proc/meminfo | awk '{print $2}')))K") +} 2>/dev/null || { # fail silently, catch physmemavailable="n/a" physmemcached="n/a" -else - physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}') - physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $6}') -fi +} -swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') -swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}') -swapfree=$(free ${humanreadable} | awk '/Swap:/ {print $4}') +swaptotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapTotal /proc/meminfo | awk '{print $2}')K") +swapfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapFree /proc/meminfo | awk '{print $2}')K") +swapused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^SwapTotal /proc/meminfo | awk '{print $2}')-$(grep ^SwapFree /proc/meminfo | awk '{print $2}')))K") ### Disk information @@ -179,4 +171,4 @@ if [ -z "${extip}" ]; then echo "x.x.x.x" fi fi -fi \ No newline at end of file +fi From 1c554a8be12c785cbb1fa49aed4a1e821987febe Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 12 Aug 2018 22:21:33 +0100 Subject: [PATCH 217/395] Details will now list if game server is on the Steam Master server (#1986) Details will list if game server is on the Steam Master server fixes #1847 --- lgsm/functions/info_distro.sh | 12 ++++++++++++ lgsm/functions/info_messages.sh | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index 4842397e8..71e3aa33c 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -172,3 +172,15 @@ if [ -z "${extip}" ]; then fi fi fi + +# Steam Master Server - checks if detected by master server +if [ "${ip}" ] && [ "${port}" ]; then + if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]||[ "${shortname}" == "jc2" ]||[ "${shortname}" == "ql" ]; then + masterserver=$(${curlpath} -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${ip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l) + if [ "${steammaster}" == "1" ]; then + masterserver="true" + else + masterserver="false" + fi + fi +fi \ No newline at end of file diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index c3a8509f2..ebe44854d 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -71,7 +71,7 @@ fn_info_message_performance(){ } | column -s $'\t' -t echo -e "" { - echo -e "${blue}Mem:\t${blue}total\t used\t free\t cached\t available${default}" + echo -e "${blue}Mem:\t${blue}total\tused\tfree\tcached\tavailable${default}" echo -e "${blue}Physical:\t${default}${physmemtotal}\t${physmemused}\t${physmemfree}\t${physmemcached}\t${physmemavailable}${default}" echo -e "${blue}Swap:\t${default}${swaptotal}\t${swapused}\t${swapfree}${default}" } | column -s $'\t' -t @@ -287,6 +287,15 @@ fn_info_message_gameserver(){ echo -e "${blue}Map rotation:\t${default}${randommap}" fi + # Listed on Master Server + if [ "${masterserver}" ];then + if [ "${masterserver}" == "true" ];then + echo -e "${blue}Master Server:\t${green}${masterserver}${default}" + else + echo -e "${blue}Master Server:\t${red}${masterserver}${default}" + fi + fi + # Online status if [ "${status}" == "0" ]; then echo -e "${blue}Status:\t${red}OFFLINE${default}" From f32ef345ef83e3c81e1b55c6248b165d8534eb46 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 13 Aug 2018 21:58:39 +0100 Subject: [PATCH 218/395] Added missing Colours (#1987) * Added missing colours * Added option to turn ansi colours off --- lgsm/config-default/config-lgsm/arkserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/arma3server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/bb2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/bbserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/bdserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/bf1942server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/bmdmserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/boserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/bsserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/bt1944server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ccserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/cod2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/cod4server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/codserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/coduoserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/codwawserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/csczserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/csgoserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/csserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/cssserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/dabserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/dmcserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/dodserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/dodsserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/doiserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/dstserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ecoserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/emserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/etlserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/fctrserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/fofserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/gesserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/gmodserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/hldmserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/hldmsserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/hwserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/insserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/jc2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/jc3server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/kf2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/kfserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/l4d2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/l4dserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/mcserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/mtaserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/mumbleserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/nmrihserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ns2cserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ns2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/nsserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/opforserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/pcserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/pstbsserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/pzserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/q2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/q3server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/qlserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/qwserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ricochetserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/roserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/rustserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/rwserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/sampserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/sbserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/sdtdserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/squadserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ss3server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/stserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/svenserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/terrariaserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/tf2server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/tfcserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ts3server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/tuserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/twserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ut2k4server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ut3server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/ut99server/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/utserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/vsserver/_default.cfg | 3 +++ lgsm/config-default/config-lgsm/wetserver/_default.cfg | 5 ++++- lgsm/config-default/config-lgsm/zpsserver/_default.cfg | 5 ++++- lgsm/functions/core_messages.sh | 5 +++++ 85 files changed, 332 insertions(+), 75 deletions(-) diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg index 30fc359ad..077dff9d2 100644 --- a/lgsm/config-default/config-lgsm/arkserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/arkserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="376030" diff --git a/lgsm/config-default/config-lgsm/arma3server/_default.cfg b/lgsm/config-default/config-lgsm/arma3server/_default.cfg index 0cb8c9688..bd6ed5a49 100644 --- a/lgsm/config-default/config-lgsm/arma3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/arma3server/_default.cfg @@ -78,7 +78,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -99,6 +99,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="233780" diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg index cbd89af35..ee29643b6 100644 --- a/lgsm/config-default/config-lgsm/bb2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bb2server/_default.cfg @@ -68,7 +68,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,6 +89,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="475370" diff --git a/lgsm/config-default/config-lgsm/bbserver/_default.cfg b/lgsm/config-default/config-lgsm/bbserver/_default.cfg index 32445f743..2ffeac39a 100644 --- a/lgsm/config-default/config-lgsm/bbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bbserver/_default.cfg @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/bdserver/_default.cfg b/lgsm/config-default/config-lgsm/bdserver/_default.cfg index f73974c77..c24024a35 100644 --- a/lgsm/config-default/config-lgsm/bdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bdserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="817300" diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg index 937b5f527..68e8e891e 100644 --- a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg @@ -55,7 +55,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -76,6 +76,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Battlefield: 1942" diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg index 3832a7243..c339b10fc 100644 --- a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg @@ -68,7 +68,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,6 +89,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="346680" diff --git a/lgsm/config-default/config-lgsm/boserver/_default.cfg b/lgsm/config-default/config-lgsm/boserver/_default.cfg index fb5ca9eb8..d5e7c9b32 100644 --- a/lgsm/config-default/config-lgsm/boserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/boserver/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -82,6 +82,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="416880" diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg index 57da82867..22bed0111 100644 --- a/lgsm/config-default/config-lgsm/bsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/bsserver/_default.cfg @@ -67,7 +67,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -88,6 +88,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="228780" diff --git a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg index 0a0401bda..8fd5cbb76 100644 --- a/lgsm/config-default/config-lgsm/bt1944server/_default.cfg +++ b/lgsm/config-default/config-lgsm/bt1944server/_default.cfg @@ -60,7 +60,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -81,6 +81,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="805140" diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg index 56a857604..119e2ae0b 100644 --- a/lgsm/config-default/config-lgsm/ccserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ccserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="383410" diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg index e08904147..07c3b78b2 100644 --- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty 2" diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg index 8791468f4..542306606 100644 --- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty 4" diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg index cefb601ba..3d495be9c 100644 --- a/lgsm/config-default/config-lgsm/codserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty" diff --git a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg index 07d306568..bc97e60c1 100644 --- a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty: United Offensive" diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg index e6061e809..c9fbfe216 100644 --- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Call of Duty: World at War" diff --git a/lgsm/config-default/config-lgsm/csczserver/_default.cfg b/lgsm/config-default/config-lgsm/csczserver/_default.cfg index fb1115389..b46d13438 100644 --- a/lgsm/config-default/config-lgsm/csczserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csczserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg index 6171682c2..ed790f3e1 100644 --- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg @@ -107,6 +107,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="740" diff --git a/lgsm/config-default/config-lgsm/csserver/_default.cfg b/lgsm/config-default/config-lgsm/csserver/_default.cfg index 8fb21ca5e..b9be8dab9 100644 --- a/lgsm/config-default/config-lgsm/csserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/csserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/cssserver/_default.cfg b/lgsm/config-default/config-lgsm/cssserver/_default.cfg index 48140dfa8..f3bfe346a 100644 --- a/lgsm/config-default/config-lgsm/cssserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/cssserver/_default.cfg @@ -68,7 +68,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,6 +89,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="232330" diff --git a/lgsm/config-default/config-lgsm/dabserver/_default.cfg b/lgsm/config-default/config-lgsm/dabserver/_default.cfg index 4ad34a64a..155cdf78e 100644 --- a/lgsm/config-default/config-lgsm/dabserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dabserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="317800" diff --git a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg index 3b339436c..20888bb30 100644 --- a/lgsm/config-default/config-lgsm/dmcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dmcserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/dodserver/_default.cfg b/lgsm/config-default/config-lgsm/dodserver/_default.cfg index 8ff65c3ce..ea53ffd16 100644 --- a/lgsm/config-default/config-lgsm/dodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg index a05e70771..86cc33502 100644 --- a/lgsm/config-default/config-lgsm/dodsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dodsserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="232290" diff --git a/lgsm/config-default/config-lgsm/doiserver/_default.cfg b/lgsm/config-default/config-lgsm/doiserver/_default.cfg index bf99996c4..da1ea65d7 100644 --- a/lgsm/config-default/config-lgsm/doiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/doiserver/_default.cfg @@ -65,7 +65,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -86,6 +86,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="462310" diff --git a/lgsm/config-default/config-lgsm/dstserver/_default.cfg b/lgsm/config-default/config-lgsm/dstserver/_default.cfg index 3137abfa4..c8c3e1093 100644 --- a/lgsm/config-default/config-lgsm/dstserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/dstserver/_default.cfg @@ -66,7 +66,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -87,6 +87,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="343050" diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg index 459916d6d..ce3347412 100644 --- a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg @@ -72,6 +72,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="739590" diff --git a/lgsm/config-default/config-lgsm/emserver/_default.cfg b/lgsm/config-default/config-lgsm/emserver/_default.cfg index 9f5e788fa..d498d0f70 100644 --- a/lgsm/config-default/config-lgsm/emserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/emserver/_default.cfg @@ -68,7 +68,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,6 +89,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="460040" diff --git a/lgsm/config-default/config-lgsm/etlserver/_default.cfg b/lgsm/config-default/config-lgsm/etlserver/_default.cfg index 5d431fd37..da56eb27a 100644 --- a/lgsm/config-default/config-lgsm/etlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/etlserver/_default.cfg @@ -55,7 +55,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -73,6 +73,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="ET: Legacy" diff --git a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg index a3186b1de..2632e7717 100644 --- a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Factorio" diff --git a/lgsm/config-default/config-lgsm/fofserver/_default.cfg b/lgsm/config-default/config-lgsm/fofserver/_default.cfg index 5673b60d4..a35374312 100644 --- a/lgsm/config-default/config-lgsm/fofserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fofserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="295230" diff --git a/lgsm/config-default/config-lgsm/gesserver/_default.cfg b/lgsm/config-default/config-lgsm/gesserver/_default.cfg index 12a5bf362..3c110ab59 100644 --- a/lgsm/config-default/config-lgsm/gesserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gesserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="310" # Source 2007 SDK diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg index 07afe4cd4..26d664c36 100644 --- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg @@ -100,6 +100,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="4020" diff --git a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg index d25c02a67..e004322ed 100644 --- a/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="232370" diff --git a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg index 8b6f7aa8a..3b4a39646 100644 --- a/lgsm/config-default/config-lgsm/hldmserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg index 2bb608f39..008675662 100644 --- a/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hldmsserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="255470" diff --git a/lgsm/config-default/config-lgsm/hwserver/_default.cfg b/lgsm/config-default/config-lgsm/hwserver/_default.cfg index 05fc0e331..fa4742cbb 100644 --- a/lgsm/config-default/config-lgsm/hwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/hwserver/_default.cfg @@ -76,7 +76,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -97,6 +97,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="405100" diff --git a/lgsm/config-default/config-lgsm/insserver/_default.cfg b/lgsm/config-default/config-lgsm/insserver/_default.cfg index 552c483fb..c26d484f5 100644 --- a/lgsm/config-default/config-lgsm/insserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/insserver/_default.cfg @@ -70,7 +70,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -91,6 +91,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="237410" diff --git a/lgsm/config-default/config-lgsm/jc2server/_default.cfg b/lgsm/config-default/config-lgsm/jc2server/_default.cfg index f76a0ad9d..d23a6c3ac 100644 --- a/lgsm/config-default/config-lgsm/jc2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc2server/_default.cfg @@ -55,7 +55,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -76,6 +76,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="261140" diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg index 80b13fe97..13d8202be 100644 --- a/lgsm/config-default/config-lgsm/jc3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg @@ -55,7 +55,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -76,6 +76,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="619960" diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg index 9aaa98911..1db17653c 100644 --- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -82,6 +82,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="232130" diff --git a/lgsm/config-default/config-lgsm/kfserver/_default.cfg b/lgsm/config-default/config-lgsm/kfserver/_default.cfg index 0357f2daa..563ebda38 100644 --- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg @@ -67,7 +67,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -88,6 +88,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="215360" diff --git a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg index edddbe01a..c6a415b60 100644 --- a/lgsm/config-default/config-lgsm/l4d2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4d2server/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="222860" diff --git a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg index 15f27ada3..ef65d69a4 100644 --- a/lgsm/config-default/config-lgsm/l4dserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/l4dserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="222840" diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg index 92830934b..6e4bbf7b2 100644 --- a/lgsm/config-default/config-lgsm/mcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mcserver/_default.cfg @@ -78,6 +78,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Minecraft" diff --git a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg index 9e5c2bb52..89bdc2715 100644 --- a/lgsm/config-default/config-lgsm/mtaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mtaserver/_default.cfg @@ -56,7 +56,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -74,6 +74,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Multi Theft Auto" diff --git a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg index 5832e70e5..adeea79cf 100644 --- a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg @@ -56,7 +56,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -77,6 +77,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Mumble" diff --git a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg index 3d85a50a4..c98423d72 100644 --- a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg @@ -68,7 +68,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,6 +89,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="317670" diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg index cb6d3249f..b3b4b1caa 100644 --- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg @@ -70,7 +70,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -91,6 +91,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="313900" diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg index 195289fb1..b842091a5 100644 --- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg @@ -74,7 +74,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -95,6 +95,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="4940" diff --git a/lgsm/config-default/config-lgsm/nsserver/_default.cfg b/lgsm/config-default/config-lgsm/nsserver/_default.cfg index 24549021b..5c56dfcec 100644 --- a/lgsm/config-default/config-lgsm/nsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/nsserver/_default.cfg @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/opforserver/_default.cfg b/lgsm/config-default/config-lgsm/opforserver/_default.cfg index 79cde28c3..8cfde2557 100644 --- a/lgsm/config-default/config-lgsm/opforserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/opforserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/pcserver/_default.cfg b/lgsm/config-default/config-lgsm/pcserver/_default.cfg index 271410ddb..e68afc412 100644 --- a/lgsm/config-default/config-lgsm/pcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pcserver/_default.cfg @@ -56,7 +56,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -77,6 +77,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="332670" diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg index ef6550d5f..8f472ce6b 100644 --- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg @@ -87,6 +87,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="746200" diff --git a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg index 6e404b837..18059d90d 100644 --- a/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="17575" diff --git a/lgsm/config-default/config-lgsm/pzserver/_default.cfg b/lgsm/config-default/config-lgsm/pzserver/_default.cfg index 7450c3642..69b0bce29 100644 --- a/lgsm/config-default/config-lgsm/pzserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/pzserver/_default.cfg @@ -58,7 +58,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="380870" diff --git a/lgsm/config-default/config-lgsm/q2server/_default.cfg b/lgsm/config-default/config-lgsm/q2server/_default.cfg index 38fbffaa5..ee016a3e0 100644 --- a/lgsm/config-default/config-lgsm/q2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q2server/_default.cfg @@ -60,7 +60,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -78,6 +78,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Quake 2" diff --git a/lgsm/config-default/config-lgsm/q3server/_default.cfg b/lgsm/config-default/config-lgsm/q3server/_default.cfg index 6ef4e7005..ff8524ef1 100644 --- a/lgsm/config-default/config-lgsm/q3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/q3server/_default.cfg @@ -60,7 +60,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -78,6 +78,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Quake 3: Arena" diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg index f7f790ded..78fec83fe 100644 --- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg @@ -60,7 +60,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -81,6 +81,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="349090" diff --git a/lgsm/config-default/config-lgsm/qwserver/_default.cfg b/lgsm/config-default/config-lgsm/qwserver/_default.cfg index 74095abb6..e4774af4a 100644 --- a/lgsm/config-default/config-lgsm/qwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/qwserver/_default.cfg @@ -59,7 +59,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -77,6 +77,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="QuakeWorld" diff --git a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg index 7ed3dc8ef..4b4830639 100644 --- a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg index bb3824bbc..627dc925c 100644 --- a/lgsm/config-default/config-lgsm/roserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -84,6 +84,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="223250" diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg index 4a199356b..b07b36be7 100644 --- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg @@ -87,7 +87,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -108,6 +108,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="258550" diff --git a/lgsm/config-default/config-lgsm/rwserver/_default.cfg b/lgsm/config-default/config-lgsm/rwserver/_default.cfg index 46b4e77de..bd86b4b45 100644 --- a/lgsm/config-default/config-lgsm/rwserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/rwserver/_default.cfg @@ -58,7 +58,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="339010" diff --git a/lgsm/config-default/config-lgsm/sampserver/_default.cfg b/lgsm/config-default/config-lgsm/sampserver/_default.cfg index dab916838..9d59e0cec 100644 --- a/lgsm/config-default/config-lgsm/sampserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sampserver/_default.cfg @@ -59,7 +59,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -77,6 +77,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="San Andreas Multiplayer" diff --git a/lgsm/config-default/config-lgsm/sbserver/_default.cfg b/lgsm/config-default/config-lgsm/sbserver/_default.cfg index ee4be268a..e0e76b536 100644 --- a/lgsm/config-default/config-lgsm/sbserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="211820" diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg index 240617558..117de44c4 100644 --- a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg @@ -79,6 +79,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="294420" diff --git a/lgsm/config-default/config-lgsm/squadserver/_default.cfg b/lgsm/config-default/config-lgsm/squadserver/_default.cfg index 22aac5113..f2ef9badf 100644 --- a/lgsm/config-default/config-lgsm/squadserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/squadserver/_default.cfg @@ -61,7 +61,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -82,6 +82,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="403240" diff --git a/lgsm/config-default/config-lgsm/ss3server/_default.cfg b/lgsm/config-default/config-lgsm/ss3server/_default.cfg index 80f15e06c..3e966cbed 100644 --- a/lgsm/config-default/config-lgsm/ss3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ss3server/_default.cfg @@ -59,7 +59,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -80,6 +80,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="41080" diff --git a/lgsm/config-default/config-lgsm/stserver/_default.cfg b/lgsm/config-default/config-lgsm/stserver/_default.cfg index 0c05dce03..543164d06 100644 --- a/lgsm/config-default/config-lgsm/stserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/stserver/_default.cfg @@ -65,7 +65,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -86,6 +86,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="600760" diff --git a/lgsm/config-default/config-lgsm/svenserver/_default.cfg b/lgsm/config-default/config-lgsm/svenserver/_default.cfg index 5fb82f7d2..b2f5353d8 100644 --- a/lgsm/config-default/config-lgsm/svenserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/svenserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="276060" diff --git a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg index ba5fa8e62..af49430de 100644 --- a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="105600" diff --git a/lgsm/config-default/config-lgsm/tf2server/_default.cfg b/lgsm/config-default/config-lgsm/tf2server/_default.cfg index ebeddf6e6..7b33483f7 100644 --- a/lgsm/config-default/config-lgsm/tf2server/_default.cfg +++ b/lgsm/config-default/config-lgsm/tf2server/_default.cfg @@ -68,7 +68,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,6 +89,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="232250" diff --git a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg index bdb269f73..367cb8e5c 100644 --- a/lgsm/config-default/config-lgsm/tfcserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tfcserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg index 40d4d5ec1..dd43a0e00 100644 --- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg @@ -51,7 +51,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -72,6 +72,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="TeamSpeak 3" diff --git a/lgsm/config-default/config-lgsm/tuserver/_default.cfg b/lgsm/config-default/config-lgsm/tuserver/_default.cfg index c029a28bf..da60b1b6a 100644 --- a/lgsm/config-default/config-lgsm/tuserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/tuserver/_default.cfg @@ -65,7 +65,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -86,6 +86,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="439660" diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg index 8139d6106..e62f38a99 100644 --- a/lgsm/config-default/config-lgsm/twserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/twserver/_default.cfg @@ -62,7 +62,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="380840" diff --git a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg index 0a71b7259..e393c3419 100644 --- a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg @@ -59,7 +59,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -77,6 +77,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament 2004" diff --git a/lgsm/config-default/config-lgsm/ut3server/_default.cfg b/lgsm/config-default/config-lgsm/ut3server/_default.cfg index ffa8bc462..5925354e5 100644 --- a/lgsm/config-default/config-lgsm/ut3server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut3server/_default.cfg @@ -70,7 +70,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -88,6 +88,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament 3" diff --git a/lgsm/config-default/config-lgsm/ut99server/_default.cfg b/lgsm/config-default/config-lgsm/ut99server/_default.cfg index 56dc8592d..45dcf1776 100644 --- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg @@ -59,7 +59,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -77,6 +77,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament 99" diff --git a/lgsm/config-default/config-lgsm/utserver/_default.cfg b/lgsm/config-default/config-lgsm/utserver/_default.cfg index 57a489d7d..bf0dc9cf1 100644 --- a/lgsm/config-default/config-lgsm/utserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/utserver/_default.cfg @@ -63,7 +63,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -81,6 +81,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Unreal Tournament" diff --git a/lgsm/config-default/config-lgsm/vsserver/_default.cfg b/lgsm/config-default/config-lgsm/vsserver/_default.cfg index 35f0c28b6..283f0abee 100644 --- a/lgsm/config-default/config-lgsm/vsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vsserver/_default.cfg @@ -83,6 +83,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="90" diff --git a/lgsm/config-default/config-lgsm/wetserver/_default.cfg b/lgsm/config-default/config-lgsm/wetserver/_default.cfg index 7b5ed581b..61b44b992 100644 --- a/lgsm/config-default/config-lgsm/wetserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/wetserver/_default.cfg @@ -55,7 +55,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -73,6 +73,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## LinuxGSM Server Details # Do not edit gamename="Wolfenstein: Enemy Territory" diff --git a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg index 623731930..a81e8345c 100644 --- a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg @@ -68,7 +68,7 @@ pushovertoken="accesstoken" # Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram # You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need +# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need # any custom string in curl - simple ignore this parameter. telegramalert="off" telegramtoken="accesstoken" @@ -89,6 +89,9 @@ logdays="7" #### LinuxGSM Advanced Settings #### +# ANSI Colors +ansi="on" + ## SteamCMD Settings # Server appid appid="17505" diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index 3a47798b3..cff44d140 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -12,13 +12,18 @@ if [ "${ansi}" != "off" ]; then # echo colors default="\e[0m" red="\e[31m" + lightred="\e[91m" green="\e[32m" + lightgreen="\e[92m" yellow="\e[33m" lightyellow="\e[93m" blue="\e[34m" lightblue="\e[94m" magenta="\e[35m" + lightmagenta="\e[95m" cyan="\e[36m" + lightcyan="\e[96m" + # carriage return & erase to end of line creeol="\r\033[K" fi From 287d5f90406742e1c0fc04093d0923cb193b538f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 13 Aug 2018 22:02:39 +0100 Subject: [PATCH 219/395] Corrected Website URL --- lgsm/functions/command_dev_query_raw.sh | 2 +- lgsm/functions/query_gamedig.sh | 2 +- tests/tests_shellcheck.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh index ad4ed7a42..2dc39b951 100644 --- a/lgsm/functions/command_dev_query_raw.sh +++ b/lgsm/functions/command_dev_query_raw.sh @@ -1,7 +1,7 @@ #!/bin/bash # command_dev_query_raw.sh function # Author: Daniel Gibbs -# Website: https://gameservermanagers.com +# Website: https://linuxgsm.com # Description: Raw gamedig output of the server. local commandname="QUERY-RAW" diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index 81b62cfac..aaba68204 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -1,7 +1,7 @@ #!/bin/bash # query_gamedig.sh function # Author: Daniel Gibbs -# Website: https://gameservermanagers.com +# Website: https://linuxgsm.com # Description: Querys a gameserver using node-gamedig. # https://github.com/sonicsnes/node-gamedig diff --git a/tests/tests_shellcheck.sh b/tests/tests_shellcheck.sh index d3d26c0c4..a249acf5a 100644 --- a/tests/tests_shellcheck.sh +++ b/tests/tests_shellcheck.sh @@ -5,7 +5,7 @@ # Purpose: Travis CI Tests: Shellcheck | Linux Game Server Management Script # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki -# Website: https://gameservermanagers.com +# Website: https://linuxgsm.com echo "=================================" echo "Travis CI Tests" From 8bf92f71677b43214f16f826cec30286a15eadd1 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 8 Sep 2018 15:57:50 +0100 Subject: [PATCH 220/395] Release 180908 --- linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index 5d792aac8..7ed07760a 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="180718" +version="180908" shortname="core" gameservername="core" rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" From dee1e1782d98e9200072268ed14ad90a899bcf0d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 8 Sep 2018 15:58:13 +0100 Subject: [PATCH 221/395] Release 180908 --- linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index 5d792aac8..7ed07760a 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="180718" +version="180908" shortname="core" gameservername="core" rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" From 50d3c42d27879ed27bd859712dfa9fd269c2fb48 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 10 Sep 2018 20:46:02 +0100 Subject: [PATCH 222/395] added .gtattributes file to ensure crlf line endings --- .gitattributes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..679dcff59 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,21 @@ +# crlf line endings for text files +* text eol=crlf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain \ No newline at end of file From d9e1af2c25ad765ff013e11690c1b100b7502f74 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 10 Sep 2018 21:50:51 +0100 Subject: [PATCH 223/395] ANSI colour disabling can now works. ansi colours fails to disable as core_messages.sh loaded before the config. ansi colours are now in a function that is called after the config has been loaded. allowing colour to only load once the config has confirmed that it is allowed. --- lgsm/functions/core_messages.sh | 3 ++- linuxgsm.sh | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index cff44d140..6dc791fc3 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -7,7 +7,7 @@ # nl: new line: message is following by a new line # eol: end of line: message is placed at the end of the current line - +fn_ansi_loader(){ if [ "${ansi}" != "off" ]; then # echo colors default="\e[0m" @@ -27,6 +27,7 @@ if [ "${ansi}" != "off" ]; then # carriage return & erase to end of line creeol="\r\033[K" fi +} # Log display ######################## diff --git a/linuxgsm.sh b/linuxgsm.sh index 7ed07760a..004f34677 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -79,14 +79,14 @@ fn_bootstrap_fetch_file(){ curlcmd=$(${curlpath} -s --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1) local exitcode=$? if [ ${exitcode} -ne 0 ]; then - echo -e "\e[0;31mFAIL\e[0m\n" + echo -e "FAIL" if [ -f "${lgsmlog}" ]; then echo -e "${remote_fileurl}" | tee -a "${lgsmlog}" echo "${curlcmd}" | tee -a "${lgsmlog}" fi exit 1 else - echo -e "\e[0;32mOK\e[0m" + echo -e "OK" fi else echo "[ FAIL ] Curl is not installed" @@ -324,10 +324,10 @@ else cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" exitcode=$? if [ ${exitcode} -ne 0 ]; then - echo -e "\e[0;31mFAIL\e[0m\n" + echo -e "FAIL" exit 1 else - echo -e "\e[0;32mOK\e[0m" + echo -e "OK" fi else function_file_diff=$(diff -q "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg") @@ -337,10 +337,10 @@ else cp -R "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" "${configdirserver}/_default.cfg" exitcode=$? if [ ${exitcode} -ne 0 ]; then - echo -e "\e[0;31mFAIL\e[0m\n" + echo -e "FAIL" exit 1 else - echo -e "\e[0;32mOK\e[0m" + echo -e "OK" fi fi fi @@ -359,11 +359,13 @@ else else source "${configdirserver}/${servicename}.cfg" fi + # Load the linuxgsm.sh in to tmpdir. If missing download it if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5" fi - + # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off + fn_ansi_loader # Prevents running of core_exit.sh for Travis. if [ "${travistest}" != "1" ]; then getopt=$1 From 46a7f8e0046f2513bd33461baf59f6b875413c1b Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 11 Sep 2018 21:02:43 +0200 Subject: [PATCH 224/395] Fix OxideRust download link The OxideMod/Oxide.Rust GitHub repository is now found under theumod/umod.rust. This, of course, has caused Oxide update to fail, and is simply fixed by swapping the URL. The Hurtworld and SevenDaysToDie are still belonging to the OxideMod account, but it may also migrate later. See: https://github.com/theumod/umod.rust --- lgsm/functions/mods_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index 659878d28..63880af5c 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -27,7 +27,7 @@ sourcemodlatestfile="$(wget "${sourcemodscrapeurl}" -q -O -)" sourcemoddownloadurl="https://www.sourcemod.net/latest.php?os=linux&version=${sourcemodmversion}" sourcemodurl="${sourcemoddownloadurl}" # Oxide -oxiderustlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | grep browser_download_url | cut -d '"' -f 4)" +oxiderustlatestlink="$(curl -s https://api.github.com/repos/theumod/umod.rust/releases/latest | grep browser_download_url | cut -d '"' -f 4)" oxidehurtworldlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep "Oxide.Hurtworld.zip")" oxidesdtdlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | grep browser_download_url | cut -d '"' -f 4)" From 501194ca60695c8de8949ee66b4b823e685c7473 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 12 Sep 2018 19:47:19 +0100 Subject: [PATCH 225/395] curl how follows redirects https://github.com/GameServerManagers/LinuxGSM/pull/2008#issuecomment-420678178 --- lgsm/functions/mods_list.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh index 63880af5c..c2c086134 100644 --- a/lgsm/functions/mods_list.sh +++ b/lgsm/functions/mods_list.sh @@ -27,9 +27,9 @@ sourcemodlatestfile="$(wget "${sourcemodscrapeurl}" -q -O -)" sourcemoddownloadurl="https://www.sourcemod.net/latest.php?os=linux&version=${sourcemodmversion}" sourcemodurl="${sourcemoddownloadurl}" # Oxide -oxiderustlatestlink="$(curl -s https://api.github.com/repos/theumod/umod.rust/releases/latest | grep browser_download_url | cut -d '"' -f 4)" -oxidehurtworldlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep "Oxide.Hurtworld.zip")" -oxidesdtdlatestlink="$(curl -s https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | grep browser_download_url | cut -d '"' -f 4)" +oxiderustlatestlink="$(curl -sL https://api.github.com/repos/theumod/umod.rust/releases/latest | grep browser_download_url | cut -d '"' -f 4)" +oxidehurtworldlatestlink="$(curl -sL https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep "Oxide.Hurtworld.zip")" +oxidesdtdlatestlink="$(curl -sL https://api.github.com/repos/OxideMod/Oxide.SevenDaysToDie/releases/latest | grep browser_download_url | cut -d '"' -f 4)" # Define mods information (required) From dd6c3afebf43a6eb361389d7eb76121b9c57a796 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 12 Sep 2018 19:57:56 +0100 Subject: [PATCH 226/395] Added Query support for Minecraft #1955 (#2003) * Added Query support for Minecraft * Fixed query enabled display in details --- lgsm/functions/command_monitor.sh | 2 +- lgsm/functions/info_config.sh | 6 ++++++ lgsm/functions/info_messages.sh | 4 +++- lgsm/functions/query_gamedig.sh | 8 ++++++++ lgsm/functions/query_gsquery.py | 6 +++++- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh index 1febd053a..4bf9ac5fc 100644 --- a/lgsm/functions/command_monitor.sh +++ b/lgsm/functions/command_monitor.sh @@ -131,7 +131,7 @@ fn_monitor_check_session(){ fn_monitor_query(){ fn_script_log_info "Querying port: query enabled" # engines that work with query - local allowed_engines_array=( avalanche2.0 avalanche3.0 goldsource idtech2 idtech3 idtech3_ql iw2.0 iw3.0 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 unreal4 ) + local allowed_engines_array=( avalanche2.0 avalanche3.0 goldsource idtech2 idtech3 idtech3_ql iw2.0 iw3.0 lwjgl2 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 unreal4 ) for allowed_engine in "${allowed_engines_array[@]}" do if [ "${allowed_engine}" == "${engine}" ]; then diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index cf548f78d..e80b7c04d 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -304,6 +304,9 @@ fn_info_config_minecraft(){ rconport="${zero}" maxplayers="${zero}" port="${zero}" + queryport="${zero}" + queryenabled="${unavailable}" + rconport="${zero}" gamemode="${unavailable}" gameworld="${unavailable}" else @@ -312,6 +315,9 @@ fn_info_config_minecraft(){ rconport=$(grep "rcon.port" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') maxplayers=$(grep "max-players" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') port=$(grep "server-port" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') + queryport=$(grep "query.port" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') + queryenabled=$(grep "enable-query" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/enable-query//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + rconport=$(grep "rcon.port" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') gamemode=$(grep "gamemode" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') gameworld=$(grep "level-name" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/level-name//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh index ebe44854d..ee80f9a28 100644 --- a/lgsm/functions/info_messages.sh +++ b/lgsm/functions/info_messages.sh @@ -155,7 +155,7 @@ fn_info_message_gameserver(){ # Query enabled (Starbound) if [ -n "${queryenabled}" ]; then - echo -e "${blue}Query enabled:\t${default}${rconpassword}" + echo -e "${blue}Query enabled:\t${default}${queryenabled}" fi # RCON enabled (Starbound) @@ -690,6 +690,8 @@ fn_info_message_minecraft(){ { echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" echo -e "> Game\tINBOUND\t${port}\ttcp" + echo -e "> Game\tINBOUND\t${queryport}\tudp" + echo -e "> Game\tINBOUND\t${rconport}\ttcp" } | column -s $'\t' -t } diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh index aaba68204..acf079b75 100644 --- a/lgsm/functions/query_gamedig.sh +++ b/lgsm/functions/query_gamedig.sh @@ -46,6 +46,14 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ]; fi done + local engine_query_array=( lwjgl2 ) + for engine_query in "${engine_query_array[@]}" + do + if [ "${engine_query}" == "${engine}" ]; then + gamedigengine="minecraft" + fi + done + local shortname_query_array=( ts3 ) for shortname_query in "${shortname_query_array[@]}" do diff --git a/lgsm/functions/query_gsquery.py b/lgsm/functions/query_gsquery.py index d672870b9..e46c3e325 100644 --- a/lgsm/functions/query_gsquery.py +++ b/lgsm/functions/query_gsquery.py @@ -20,18 +20,22 @@ class gsquery: sourcequery=[ 'avalanche3.0','madness','quakelive','realvirtuality','refractor','source','goldsource','spark','starbound','unity3d', 'unreal4' ] idtech3query=['idtech3','quake','iw3.0'] idtech2query=['idtech2','iw2.0'] + minecraftquery=['minecraft','lwjgl2'] if self.option.engine in sourcequery: self.query_prompt_string = b'\xFF\xFF\xFF\xFFTSource Engine Query\0' elif self.option.engine in idtech2query: self.query_prompt_string = b'\xff\xff\xff\xffstatus\x00' elif self.option.engine in idtech3query: self.query_prompt_string = b'\xff\xff\xff\xffgetstatus' + elif self.option.engine in minecraftquery: + self.query_prompt_string = b'\xFE\xFD\x09\x3d\x54\x1f\x93' elif self.option.engine == 'avalanche2.0': self.query_prompt_string = b'\xFE\xFD\x09\x10\x20\x30\x40' elif self.option.engine == 'unreal': self.query_prompt_string = b'\x5C\x69\x6E\x66\x6F\x5C' elif self.option.engine == 'unreal2': self.query_prompt_string = b'\x79\x00\x00\x00\x00' + self.connected = False self.response = None self.sanity_checks() @@ -100,7 +104,7 @@ if __name__ == '__main__': action='store', dest='engine', default=False, - help='Engine type: avalanche2.0, avalanche3.0, goldsource, idtech2, idtech3, iw2.0, iw3.0, realvirtuality, quake, quakelive, refractor, spark, source, unity3d, unreal, unreal2.' + help='Engine type: avalanche2.0, avalanche3.0, goldsource, idtech2, idtech3, iw2.0, iw3.0, minecraft, quake, quakelive, realvirtuality, refractor, spark, source, unity3d, unreal, unreal2.' ) parser.add_option( '-v', '--verbose', From 9d005b0b7621eaeeea99333bdd1b856e1e9aa03d Mon Sep 17 00:00:00 2001 From: Aleksandr Razumov Date: Tue, 18 Sep 2018 16:55:40 +0300 Subject: [PATCH 227/395] use branch name while checking for updates --- lgsm/functions/update_steamcmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index b60adbc53..c0fc89691 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -166,7 +166,7 @@ fn_update_steamcmd_check(){ # Gets availablebuild info cd "${steamcmddir}" || exit - availablebuild=$(./steamcmd.sh +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +app_info_print "${appid}" +quit | sed -n '/branch/,$p' | grep -m 1 buildid | tr -cd '[:digit:]') + availablebuild=$(./steamcmd.sh +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed '1,/branches/d' | sed "1,/${branchname}/d" | grep -m 1 buildid | tr -cd '[:digit:]') if [ -z "${availablebuild}" ]; then fn_print_fail "Checking for update: SteamCMD" sleep 0.5 From 4f0b5330a1170be57c522bcd505a1937340d17f1 Mon Sep 17 00:00:00 2001 From: The Codacy Badger Date: Sat, 22 Sep 2018 18:39:13 +0000 Subject: [PATCH 228/395] Add Codacy badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c7d0c8beb..dfc62111f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ linux Game Server Managers +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3e98be27840043a090c3ab6e35db44b0)](https://app.codacy.com/app/dgibbs64/LinuxGSM?utm_source=github.com&utm_medium=referral&utm_content=GameServerManagers/LinuxGSM&utm_campaign=Badge_Grade_Dashboard) [![LinuxGSM](https://img.shields.io/badge/-LinuxGSM-2b2b2b.svg?logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAACsAAABACAYAAACDbo5ZAAAGD0lEQVR4AcWYa2wUVRvHz75c2vJ2disXoUBEVIioRAx%2BMIFA1IRwUS6KCCiIKBrvhEYiiGm5iBgk8QOGEgUUDYTttmVZWFr2UmwURS6iYAoCtmisElSsdHdbkT7%2BTzoNy%2BGc2dm54C%2F5Rdkz85x%2FZ86ZOXOYXYhIg3Phx%2FA4PAcv6f%2Btg5vhHJjP3EcZsgsshufJHH%2FAJbDztQ7aG35J1vgCXn%2BtgvrgEbLHYei9FmE3kDOUuh10OGwjZ7gEh7kZ9gNyllK3gnrg7%2BQs56DHjbCDyB0GuRF2ArnDeDfCziF3mO1G2FfJHRa4EXYpuUOxG2GXkzuUuBH2TXKH5W6ELSV3eM%2BNsOUk5yQcAY8p2uvgSPitor3MjbB1UOQXOFBvHwpbhPYWOExvL4SNUOQ7p4P2JTlzhOPmCu0vCu1PQpE2WOhk2MdJjk9y7HNwP1wEPUJbAcmZ6WTYrYolnifbxZBiibnFySHQCkUaLdY7C0V4%2FT5OhF1JcuIW6%2B0lOcvsBi2Ezao3j8Ov7Quwj52w60jNKIs1R5GatVaDDoEXSU4D7GSxbidYT3IuwjusFK0mNUVMwaZNNbl%2B%2F87hoVCom0HthaQmnG3QB0lNPcxlCvz%2B0GtlZTuorCxYYlA%2FDzbY%2FnrAgV3hCVLzCDMgEAi9wMMi9IIM%2FUwnNXWwi5mwRaSmmmXA798xq%2F3Khp420VeE1LyS6eQeBhttSXgzywCCToIUCOyYZvKLOWWwkdfd6ORVpGYJM0F5efDe9mEQHGty2BWTmhVGO4PNBmOoKzMBxmo%2FhD25dWvljSbD5hjMkb9gT9lJq63Mzi1bKkbjloc7xBWtwiRrDASCVRi%2FRxA8if%2BvrawMTzYI%2FACpeUv2KFFtDcUyTKilCHcis8G1Ga7wHpLzG8wVFs1K7jaeUKHZfIxmkj9%2FM4S9x9RGiMEudo0QbCVu9Xqn5PWEwLUk5%2FP0iaXac53I0kAH9Sau4m54lo%2FdTMfyekLYKQZ7ub34AbMMlmw5irC2VYTN0fuVMYMf8JHxJ7L7YYXAlSRnI2%2F8RtH4siTsDMz%2BZ5yS15OEXUxyDjGD1%2BvEq8MG16CDzY6JepKwT6geYbzxb0XjGMl7vwGSgzZIwo4nOa1M8Yr9Afb%2Fj8L21%2FsXaeaNZ2A6KTiEASph%2F0vF80cn4tokqu79fzfCUk2vfF4%2FFdFGEjGPHvg2yWrsDG%2F4%2BqpZB8jPOiXjWk0y5iXdM3XhKUvxBTA9UvHuvNPh%2Bzb%2BWj10z6nwuHWBbQFMvNCjKnn7qd1jS%2Fnx9VX3b6jC%2BbwOr5eMe3%2B83IcW4%2F3qgT%2BUTbA9srGaiHsn8AKiF6Ld%2FxF%2FOx6eeAJXabvK78MTTornNMd6XJTVR7%2Fj9bBjhFxV%2FMc1kJOAy2AeA%2FgrV4mFVDZFCqm8rEJ6qysCAWqK9iaztRJRbWXa4moFTELOav7jY%2FqAvoXp0Gc9NX7bIZl17%2FZl0rC1wRLeno0NvP%2B0CTcYNnS8wW6CtzNANaxzKqo9hRNOQ8rGo7tmSsMe2zWdt2frqVRcm5s2fofCgawDNHRNxnyfqgsYez4y4ADCjRM9H73hsNWafILTQdaFiSTj%2BQ%2FxA6yH7d%2BCmR8XbYr0a7VTF2N4siSsb5qdos3R6%2FjGxpULFfw7EfORnbrI9TAToX0sD40%2F2ylcGdh2Rdhg%2BSf2gka9jRTqK9%2BGwgHz7RTfVbHxirDhivdthYUvMRX8aYAD9lstvi%2B0aDL2DUZ0eCBUNNVG0IP65FLTWqPdiqdC0koHTVXe7iyNRG23QotBEy1RbTAzQyrmnYUT2rLsoA13JpcB4eVC2daBM1g2JGLekmwf5On7EJfngfZTNnVSce8bFjaTmQdvs%2FXmO%2FJVpoXdx3RSUe9O00Fj3nUdy0RLgRHiHXOPGW1h2uKZ07c9rG%2Bxyefp23pQeyBIEQoavYlakrG8fnrY5yHn2fbxXzAgw7m8bT5zkkSk4C7cpmOK21esB%2FXAQ5DzFfTo43%2BF%2FDzf0eZ4wZ3MDSjMcvD6nIeOahGgia%2FyU3HforTPkWkwnakdn0cI9jqfbPjD%2FuQLJr6644snlgX%2FApOMoyd1R5%2FxAAAAAElFTkSuQmCC)](https://linuxgsm.com) [![Build Status](https://travis-ci.org/GameServerManagers/LinuxGSM.svg?branch=master)](https://travis-ci.org/GameServerManagers/LinuxGSM) [![Under Development](https://badge.waffle.io/GameServerManagers/LinuxGSM.svg?label=Status:%20under%20development&title=Under%20Development)](http://waffle.io/GameServerManagers/LinuxGSM) From 9767140c1a9b0a1205bb565357aa07ec3e388e4b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 22 Sep 2018 19:40:47 +0100 Subject: [PATCH 229/395] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dfc62111f..ce5cf7e6e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ linux Game Server Managers -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3e98be27840043a090c3ab6e35db44b0)](https://app.codacy.com/app/dgibbs64/LinuxGSM?utm_source=github.com&utm_medium=referral&utm_content=GameServerManagers/LinuxGSM&utm_campaign=Badge_Grade_Dashboard) [![LinuxGSM](https://img.shields.io/badge/-LinuxGSM-2b2b2b.svg?logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAACsAAABACAYAAACDbo5ZAAAGD0lEQVR4AcWYa2wUVRvHz75c2vJ2disXoUBEVIioRAx%2BMIFA1IRwUS6KCCiIKBrvhEYiiGm5iBgk8QOGEgUUDYTttmVZWFr2UmwURS6iYAoCtmisElSsdHdbkT7%2BTzoNy%2BGc2dm54C%2F5Rdkz85x%2FZ86ZOXOYXYhIg3Phx%2FA4PAcv6f%2Btg5vhHJjP3EcZsgsshufJHH%2FAJbDztQ7aG35J1vgCXn%2BtgvrgEbLHYei9FmE3kDOUuh10OGwjZ7gEh7kZ9gNyllK3gnrg7%2BQs56DHjbCDyB0GuRF2ArnDeDfCziF3mO1G2FfJHRa4EXYpuUOxG2GXkzuUuBH2TXKH5W6ELSV3eM%2BNsOUk5yQcAY8p2uvgSPitor3MjbB1UOQXOFBvHwpbhPYWOExvL4SNUOQ7p4P2JTlzhOPmCu0vCu1PQpE2WOhk2MdJjk9y7HNwP1wEPUJbAcmZ6WTYrYolnifbxZBiibnFySHQCkUaLdY7C0V4%2FT5OhF1JcuIW6%2B0lOcvsBi2Ezao3j8Ov7Quwj52w60jNKIs1R5GatVaDDoEXSU4D7GSxbidYT3IuwjusFK0mNUVMwaZNNbl%2B%2F87hoVCom0HthaQmnG3QB0lNPcxlCvz%2B0GtlZTuorCxYYlA%2FDzbY%2FnrAgV3hCVLzCDMgEAi9wMMi9IIM%2FUwnNXWwi5mwRaSmmmXA798xq%2F3Khp420VeE1LyS6eQeBhttSXgzywCCToIUCOyYZvKLOWWwkdfd6ORVpGYJM0F5efDe9mEQHGty2BWTmhVGO4PNBmOoKzMBxmo%2FhD25dWvljSbD5hjMkb9gT9lJq63Mzi1bKkbjloc7xBWtwiRrDASCVRi%2FRxA8if%2BvrawMTzYI%2FACpeUv2KFFtDcUyTKilCHcis8G1Ga7wHpLzG8wVFs1K7jaeUKHZfIxmkj9%2FM4S9x9RGiMEudo0QbCVu9Xqn5PWEwLUk5%2FP0iaXac53I0kAH9Sau4m54lo%2FdTMfyekLYKQZ7ub34AbMMlmw5irC2VYTN0fuVMYMf8JHxJ7L7YYXAlSRnI2%2F8RtH4siTsDMz%2BZ5yS15OEXUxyDjGD1%2BvEq8MG16CDzY6JepKwT6geYbzxb0XjGMl7vwGSgzZIwo4nOa1M8Yr9Afb%2Fj8L21%2FsXaeaNZ2A6KTiEASph%2F0vF80cn4tokqu79fzfCUk2vfF4%2FFdFGEjGPHvg2yWrsDG%2F4%2BqpZB8jPOiXjWk0y5iXdM3XhKUvxBTA9UvHuvNPh%2Bzb%2BWj10z6nwuHWBbQFMvNCjKnn7qd1jS%2Fnx9VX3b6jC%2BbwOr5eMe3%2B83IcW4%2F3qgT%2BUTbA9srGaiHsn8AKiF6Ld%2FxF%2FOx6eeAJXabvK78MTTornNMd6XJTVR7%2Fj9bBjhFxV%2FMc1kJOAy2AeA%2FgrV4mFVDZFCqm8rEJ6qysCAWqK9iaztRJRbWXa4moFTELOav7jY%2FqAvoXp0Gc9NX7bIZl17%2FZl0rC1wRLeno0NvP%2B0CTcYNnS8wW6CtzNANaxzKqo9hRNOQ8rGo7tmSsMe2zWdt2frqVRcm5s2fofCgawDNHRNxnyfqgsYez4y4ADCjRM9H73hsNWafILTQdaFiSTj%2BQ%2FxA6yH7d%2BCmR8XbYr0a7VTF2N4siSsb5qdos3R6%2FjGxpULFfw7EfORnbrI9TAToX0sD40%2F2ylcGdh2Rdhg%2BSf2gka9jRTqK9%2BGwgHz7RTfVbHxirDhivdthYUvMRX8aYAD9lstvi%2B0aDL2DUZ0eCBUNNVG0IP65FLTWqPdiqdC0koHTVXe7iyNRG23QotBEy1RbTAzQyrmnYUT2rLsoA13JpcB4eVC2daBM1g2JGLekmwf5On7EJfngfZTNnVSce8bFjaTmQdvs%2FXmO%2FJVpoXdx3RSUe9O00Fj3nUdy0RLgRHiHXOPGW1h2uKZ07c9rG%2Bxyefp23pQeyBIEQoavYlakrG8fnrY5yHn2fbxXzAgw7m8bT5zkkSk4C7cpmOK21esB%2FXAQ5DzFfTo43%2BF%2FDzf0eZ4wZ3MDSjMcvD6nIeOahGgia%2FyU3HforTPkWkwnakdn0cI9jqfbPjD%2FuQLJr6644snlgX%2FApOMoyd1R5%2FxAAAAAElFTkSuQmCC)](https://linuxgsm.com) [![Build Status](https://travis-ci.org/GameServerManagers/LinuxGSM.svg?branch=master)](https://travis-ci.org/GameServerManagers/LinuxGSM) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3e98be27840043a090c3ab6e35db44b0)](https://app.codacy.com/app/dgibbs64/LinuxGSM?utm_source=github.com&utm_medium=referral&utm_content=GameServerManagers/LinuxGSM&utm_campaign=Badge_Grade_Dashboard) [![Under Development](https://badge.waffle.io/GameServerManagers/LinuxGSM.svg?label=Status:%20under%20development&title=Under%20Development)](http://waffle.io/GameServerManagers/LinuxGSM) [![Discord](https://discordapp.com/api/guilds/127498813903601664/widget.png?style=shield)](https://linuxgsm.com/discord) [![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://github.com/GameServerManagers/LinuxGSM/blob/master/LICENSE) @@ -61,4 +61,4 @@ If you want to donate to the project you can via PayPal. I have had a may kind p
  • Twitter
  • Facebook
  • Google+
    • -