From bce3cc7ea0761b7edf47ed63874e50764afeccb7 Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Tue, 30 Aug 2016 02:43:06 -0400 Subject: [PATCH 001/114] adding Quake 2 --- Quake2/q2server | 142 +++++++++++++++++++++++++ lgsm/functions/command_install.sh | 2 +- lgsm/functions/install_server_files.sh | 2 + 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 Quake2/q2server diff --git a/Quake2/q2server b/Quake2/q2server new file mode 100644 index 000000000..8f84aa6c3 --- /dev/null +++ b/Quake2/q2server @@ -0,0 +1,142 @@ +#!/bin/bash +# Quake 2 +# Server Management Script +# Author: Daniel Gibbs +# Website: https://gameservermanagers.com +if [ -f ".dev-debug" ]; then + exec 5>dev-debug.log + BASH_XTRACEFD="5" + set -x +fi + +version="210516" + +#### Variables #### + +# Notification Alerts +# (on|off) + +# Email +emailalert="off" +email="email@example.com" + +# Pushbullet +# https://www.pushbullet.com/#settings +pushbulletalert="off" +pushbullettoken="accesstoken" + +# Start Variables +defaultmap="q2dm1" +ip="0.0.0.0" +port="27910" + +fn_parms(){ +parms="+set dedicated 1 +set ip ${ip} +set port ${port} +exec ${servercfg} +set deathmatch 1 +map ${defaultmap}" +} + +#### Advanced Variables #### + +# Github Branch Select +# Allows for the use of different function files +# from a different repo and/or branch. +githubuser="GameServerManagers" +githubrepo="LinuxGSM" +githubbranch="master" + +# Server Details +servicename="quake2-server" +gamename="Quake2" +engine="idtech2" + +# Directories +rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" +selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" +lockselfname=".${servicename}.lock" +lgsmdir="${rootdir}/lgsm" +functionsdir="${lgsmdir}/functions" +libdir="${lgsmdir}/lib" +filesdir="${rootdir}/serverfiles" +systemdir="${filesdir}/baseq2" +executabledir="${systemdir}" +executable="./quake2" +servercfg="${servicename}.cfg" +servercfgfullpath="${servercfgdir}/${servercfg}" +backupdir="${rootdir}/backups" + +# Logging +logdays="7" +gamelogdir="${filesdir}/Logs" +scriptlogdir="${rootdir}/log/script" +consolelogdir="${rootdir}/log/console" +consolelogging="on" + +scriptlog="${scriptlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +emaillog="${scriptlogdir}/${servicename}-email.log" + +scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log" + +##### Script ##### +# Do not edit + +# Fetches core_dl for file downloads +fn_fetch_core_dl(){ +github_file_url_dir="lgsm/functions" +github_file_url_name="${functionfile}" +filedir="${functionsdir}" +filename="${github_file_url_name}" +githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" +# If the file is missing, then download +if [ ! -f "${filedir}/${filename}" ]; then + if [ ! -d "${filedir}" ]; then + mkdir -p "${filedir}" + fi + echo -e " fetching ${filename}...\c" + # Check curl exists and use available path + curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)" + for curlcmd in ${curlpaths} + do + if [ -x "${curlcmd}" ]; then + break + fi + done + # If curl exists download file + if [ "$(basename ${curlcmd})" == "curl" ]; then + curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1) + if [ $? -ne 0 ]; then + echo -e "\e[0;31mFAIL\e[0m\n" + echo "${curlfetch}" + echo -e "${githuburl}\n" + exit 1 + else + echo -e "\e[0;32mOK\e[0m" + fi + else + echo -e "\e[0;31mFAIL\e[0m\n" + echo "Curl is not installed!" + echo -e "" + exit 1 + fi + chmod +x "${filedir}/${filename}" +fi +source "${filedir}/${filename}" +} + +core_dl.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +core_functions.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +core_dl.sh +core_functions.sh + +getopt=$1 +core_getopt.sh diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index b4beceed4..6db74e805 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -18,7 +18,7 @@ check_deps.sh if [ "${gamename}" == "Unreal Tournament 2004" ]; then install_server_files.sh install_ut2k4_key.sh -elif [ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Enemy Territory" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]; then +elif [ "${gamename}" == "Quake 2" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Enemy Territory" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]; then installer=1 install_server_files.sh elif [ -n "${appid}" ]; then diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 4c5f33f0d..74d0793e6 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -23,6 +23,8 @@ fn_install_server_files(){ fileurl="http://files.gameservermanagers.com/UnrealTournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${lgsmdir}/tmp"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip"; executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6" elif [ "${gamename}" == "GoldenEye: Source" ]; then fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="976cebc812cd8af01c272e97835e77ce" + elif [ "${gamename}" == "Quake 2" ]; then + fileurl="https://s3.amazonaws.com/linuxgsm/quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake2-3.20-glibc-i386-full-linux2.0.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="0b8c7e2d51f40b56b328c69e986e7c5f" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From 652721c37fc516855233c89e7ab9c5a48efa7d25 Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Tue, 30 Aug 2016 02:45:34 -0400 Subject: [PATCH 002/114] fix --- Quake2/q2server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Quake2/q2server b/Quake2/q2server index 8f84aa6c3..0d0d6a823 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -45,7 +45,7 @@ githubbranch="master" # Server Details servicename="quake2-server" -gamename="Quake2" +gamename="Quake 2" engine="idtech2" # Directories From aedf5a9881f6fb6074cb77b0317e7d6ee424df3a Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Tue, 30 Aug 2016 02:50:11 -0400 Subject: [PATCH 003/114] folder fix --- Quake2/q2server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Quake2/q2server b/Quake2/q2server index 0d0d6a823..da38e6780 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -57,7 +57,7 @@ functionsdir="${lgsmdir}/functions" libdir="${lgsmdir}/lib" filesdir="${rootdir}/serverfiles" systemdir="${filesdir}/baseq2" -executabledir="${systemdir}" +executabledir="${filesdir}" executable="./quake2" servercfg="${servicename}.cfg" servercfgfullpath="${servercfgdir}/${servercfg}" From c1bb94b8097d5c6768c843120543f086e1dcaf55 Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Tue, 30 Aug 2016 03:03:04 -0400 Subject: [PATCH 004/114] fix --- Quake2/q2server | 1 + lgsm/functions/info_glibc.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Quake2/q2server b/Quake2/q2server index da38e6780..c548d6ecb 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -60,6 +60,7 @@ systemdir="${filesdir}/baseq2" executabledir="${filesdir}" executable="./quake2" servercfg="${servicename}.cfg" +servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" backupdir="${rootdir}/backups" diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 40ed32cde..fa461b621 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -98,6 +98,9 @@ elif [ "${gamename}" == "TeamSpeak 3" ]; then elif [ "${gamename}" == "Mumble" ]; then glibcrequired="NOT REQUIRED" glibcfix="no" +elif [ "${engine}" == "idtech2" ]; then + glibcrequired="2.0" + glibcfix="no" elif [ "${engine}" == "idtech3" ]; then glibcrequired="2.0" glibcfix="no" From a97f7e96ed47286059218b0fbc966a80b33d44a3 Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Tue, 30 Aug 2016 03:10:13 -0400 Subject: [PATCH 005/114] adding Quake2 default config --- Quake2/cfg/lgsm-default.cfg | 15 +++++++++++++++ Quake2/q2server | 1 + lgsm/functions/install_config.sh | 6 ++++++ 3 files changed, 22 insertions(+) create mode 100644 Quake2/cfg/lgsm-default.cfg diff --git a/Quake2/cfg/lgsm-default.cfg b/Quake2/cfg/lgsm-default.cfg new file mode 100644 index 000000000..d59e3505f --- /dev/null +++ b/Quake2/cfg/lgsm-default.cfg @@ -0,0 +1,15 @@ +set hostname "" +set rcon_password "" +set location "The Internet" +set website "https://gameservermanagers.com/" +set deathmatch 1 +set maxclients 8 +set timelimit 30 +set fraglimit 30 + +map q2dm1 + +// to advertise your server to a public "master server" add something +// like this: +//set public 1 +//setmaster master.q2servers.com diff --git a/Quake2/q2server b/Quake2/q2server index c548d6ecb..c4ed1f481 100644 --- a/Quake2/q2server +++ b/Quake2/q2server @@ -62,6 +62,7 @@ executable="./quake2" servercfg="${servicename}.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" +servercfgdefault="${servercfgdir}/lgsm-default.cfg" backupdir="${rootdir}/backups" # Logging diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 1aafd1602..1a1d76b00 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -383,6 +383,12 @@ elif [ "${gamename}" == "Project Zomboid" ]; then wget -N /dev/null ${githuburl}/ProjectZomboid/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq sleep 1 fn_defaultconfig +elif [ "${gamename}" == "Quake 2" ]; then + echo -e "downloading lgsm-default.cfg...\c" + wget -N /dev/null ${githuburl}/Quake2/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 + fn_defaultconfig + fn_userinputconfig elif [ "${gamename}" == "Quake Live" ]; then echo -e "downloading lgsm-default.cfg...\c" wget -N /dev/null ${githuburl}/QuakeLive/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq From e037977b7cc8a44094b2b8fa9f542586cd0a35dd Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Wed, 31 Aug 2016 02:17:59 -0400 Subject: [PATCH 006/114] adding Quake 3: Team Arena --- Quake3/cfg/lgsm-default.cfg | 36 +++++++ Quake3/q3server | 143 +++++++++++++++++++++++++ lgsm/functions/command_install.sh | 2 +- lgsm/functions/install_config.sh | 6 ++ lgsm/functions/install_server_files.sh | 2 + 5 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 Quake3/cfg/lgsm-default.cfg create mode 100644 Quake3/q3server diff --git a/Quake3/cfg/lgsm-default.cfg b/Quake3/cfg/lgsm-default.cfg new file mode 100644 index 000000000..fddb8347e --- /dev/null +++ b/Quake3/cfg/lgsm-default.cfg @@ -0,0 +1,36 @@ +set sv_hostname "" +set sv_maxclients 10 +set g_motd "LGSM Quake3 Server" +set g_forcerespawn 15 +set rconpassword "" +set g_gametype 1 +set fraglimit 50 +set timelimit 20 + +//Here's the map-cycle. When fraglimit or timelimit is reached, the map is automatically changed. +//Otherwise it would just play the same map again. +set m1 "map q3dm1; set nextmap vstr m2" +set m2 "map q3dm2; set nextmap vstr m3" +set m3 "map q3dm3; set nextmap vstr m4" +set m4 "map q3tourney1; set nextmap vstr m5" +set m5 "map q3dm4; set nextmap vstr m6" +set m6 "map q3dm5; set nextmap vstr m7" +set m7 "map q3dm6; set nextmap vstr m8" +set m8 "map q3tourney2; set nextmap vstr m9" +set m9 "map q3dm7; set nextmap vstr m10" +set m10 "map q3dm8; set nextmap vstr m11" +set m11 "map q3dm9; set nextmap vstr m12" +set m12 "map q3tourney3; set nextmap vstr m13" +set m13 "map q3dm10; set nextmap vstr m14" +set m14 "map q3dm11; set nextmap vstr m15" +set m15 "map q3dm12; set nextmap vstr m16" +set m16 "map q3tourney4; set nextmap vstr m17" +set m17 "map q3dm13; set nextmap vstr m18" +set m18 "map q3dm14; set nextmap vstr m19" +set m19 "map q3dm15; set nextmap vstr m20" +set m20 "map q3tourney5; set nextmap vstr m21" +set m21 "map q3dm16; set nextmap vstr m22" +set m22 "map q3dm17; set nextmap vstr m23" +set m23 "map q3dm18; set nextmap vstr m24" +set m24 "map q3dm19; set nextmap vstr m25" +set m25 "map q3tourney6; set nextmap vstr m1" \ No newline at end of file diff --git a/Quake3/q3server b/Quake3/q3server new file mode 100644 index 000000000..d247fa69b --- /dev/null +++ b/Quake3/q3server @@ -0,0 +1,143 @@ +#!/bin/bash +# Quake 3: Team Arena +# Server Management Script +# Author: Daniel Gibbs +# Website: https://gameservermanagers.com +if [ -f ".dev-debug" ]; then + exec 5>dev-debug.log + BASH_XTRACEFD="5" + set -x +fi + +version="210516" + +#### Variables #### + +# Notification Alerts +# (on|off) + +# Email +emailalert="off" +email="email@example.com" + +# Pushbullet +# https://www.pushbullet.com/#settings +pushbulletalert="off" +pushbullettoken="accesstoken" + +# Start Variables +ip="0.0.0.0" +port="27960" + +fn_parms(){ +parms="+set sv_punkbuster 1 +set fs_basepath ${filesdir} +set dedicated 1 +set com_hunkMegs 32 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg}" +} + +#### Advanced Variables #### + +# Github Branch Select +# Allows for the use of different function files +# from a different repo and/or branch. +githubuser="GameServerManagers" +githubrepo="LinuxGSM" +githubbranch="master" + +# Server Details +servicename="quake3-server" +gamename="Quake 3: Team Arena" +engine="idtech3" + +# Directories +rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" +selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" +lockselfname=".${servicename}.lock" +lgsmdir="${rootdir}/lgsm" +functionsdir="${lgsmdir}/functions" +libdir="${lgsmdir}/lib" +filesdir="${rootdir}/serverfiles" +systemdir="${filesdir}/baseq3" +executabledir="${filesdir}" +executable="./q3ded" +servercfg="${servicename}.cfg" +servercfgdir="${systemdir}" +servercfgfullpath="${servercfgdir}/${servercfg}" +servercfgdefault="${servercfgdir}/lgsm-default.cfg" +backupdir="${rootdir}/backups" + +# Logging +logdays="7" +gamelogdir="${filesdir}/Logs" +scriptlogdir="${rootdir}/log/script" +consolelogdir="${rootdir}/log/console" +consolelogging="on" + +scriptlog="${scriptlogdir}/${servicename}-script.log" +consolelog="${consolelogdir}/${servicename}-console.log" +emaillog="${scriptlogdir}/${servicename}-email.log" + +scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log" +consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log" + +##### Script ##### +# Do not edit + +# Fetches core_dl for file downloads +fn_fetch_core_dl(){ +github_file_url_dir="lgsm/functions" +github_file_url_name="${functionfile}" +filedir="${functionsdir}" +filename="${github_file_url_name}" +githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" +# If the file is missing, then download +if [ ! -f "${filedir}/${filename}" ]; then + if [ ! -d "${filedir}" ]; then + mkdir -p "${filedir}" + fi + echo -e " fetching ${filename}...\c" + # Check curl exists and use available path + curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)" + for curlcmd in ${curlpaths} + do + if [ -x "${curlcmd}" ]; then + break + fi + done + # If curl exists download file + if [ "$(basename ${curlcmd})" == "curl" ]; then + curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1) + if [ $? -ne 0 ]; then + echo -e "\e[0;31mFAIL\e[0m\n" + echo "${curlfetch}" + echo -e "${githuburl}\n" + exit 1 + else + echo -e "\e[0;32mOK\e[0m" + fi + else + echo -e "\e[0;31mFAIL\e[0m\n" + echo "Curl is not installed!" + echo -e "" + exit 1 + fi + chmod +x "${filedir}/${filename}" +fi +source "${filedir}/${filename}" +} + +core_dl.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +core_functions.sh(){ +# Functions are defined in core_functions.sh. +functionfile="${FUNCNAME}" +fn_fetch_core_dl +} + +core_dl.sh +core_functions.sh + +getopt=$1 +core_getopt.sh \ No newline at end of file diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index bcfe36fd2..32ef1a4e6 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -18,7 +18,7 @@ check_deps.sh if [ "${gamename}" == "Unreal Tournament 2004" ]; then install_server_files.sh install_ut2k4_key.sh -elif [ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Enemy Territory" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]; then +elif [ "${gamename}" == "Quake 3: Team Arena" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Enemy Territory" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]; then installer=1 install_server_files.sh elif [ -n "${appid}" ]; then diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 5a856f8e6..3e712e30a 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -383,6 +383,12 @@ elif [ "${gamename}" == "Project Zomboid" ]; then wget -N /dev/null ${githuburl}/ProjectZomboid/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq sleep 1 fn_defaultconfig +elif [ "${gamename}" == "Quake 3: Team Arena" ]; then + echo -e "downloading lgsm-default.cfg...\c" + wget -N /dev/null ${githuburl}/Quake3/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 + fn_defaultconfig + fn_userinputconfig elif [ "${gamename}" == "Quake Live" ]; then echo -e "downloading lgsm-default.cfg...\c" wget -N /dev/null ${githuburl}/QuakeLive/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 78057b680..38dc70b5a 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -23,6 +23,8 @@ fn_install_server_files(){ fileurl="http://files.gameservermanagers.com/UnrealTournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${lgsmdir}/tmp"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip"; executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6" elif [ "${gamename}" == "GoldenEye: Source" ]; then fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_full_server_linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="254533d4643ad2fe6f1f3ecc4f6b5e5f" + elif [ "${gamename}" == "Quake 3: Team Arena" ]; then + fileurl="https://s3.amazonaws.com/linuxgsm/quake3-1.32b-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32b-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="8fe61809ade4f9cce24e520043afe91b" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From 3781817d46236cf1e422e31201ff524a3ca2a89b Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Wed, 31 Aug 2016 02:50:42 -0400 Subject: [PATCH 007/114] update --- Quake3/cfg/lgsm-default.cfg | 4 ++-- Quake3/q3server | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Quake3/cfg/lgsm-default.cfg b/Quake3/cfg/lgsm-default.cfg index fddb8347e..b392ecad2 100644 --- a/Quake3/cfg/lgsm-default.cfg +++ b/Quake3/cfg/lgsm-default.cfg @@ -1,9 +1,9 @@ set sv_hostname "" -set sv_maxclients 10 +set sv_maxclients 16 set g_motd "LGSM Quake3 Server" set g_forcerespawn 15 set rconpassword "" -set g_gametype 1 +set g_gametype 0 - Sets the type of game. 0 - Free for all, 1 - Tournament, 2 - Free for all(again), 3 - Team Deathmatch, 4 - Capture the Flag set fraglimit 50 set timelimit 20 diff --git a/Quake3/q3server b/Quake3/q3server index d247fa69b..4e722b08e 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -26,11 +26,12 @@ pushbulletalert="off" pushbullettoken="accesstoken" # Start Variables +defaultmap="q3dm17" ip="0.0.0.0" port="27960" fn_parms(){ -parms="+set sv_punkbuster 1 +set fs_basepath ${filesdir} +set dedicated 1 +set com_hunkMegs 32 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg}" +parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set com_hunkMegs 32 +set net_ip ${ip} +set net_port ${port} +exec ${servercfg} +map ${defaultmap}" } #### Advanced Variables #### From f4ca76dfe086b4240aefd66bc49f60afc5d1e4eb Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Wed, 31 Aug 2016 03:07:56 -0400 Subject: [PATCH 008/114] config fix --- Quake3/cfg/lgsm-default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Quake3/cfg/lgsm-default.cfg b/Quake3/cfg/lgsm-default.cfg index b392ecad2..caccea760 100644 --- a/Quake3/cfg/lgsm-default.cfg +++ b/Quake3/cfg/lgsm-default.cfg @@ -3,7 +3,7 @@ set sv_maxclients 16 set g_motd "LGSM Quake3 Server" set g_forcerespawn 15 set rconpassword "" -set g_gametype 0 - Sets the type of game. 0 - Free for all, 1 - Tournament, 2 - Free for all(again), 3 - Team Deathmatch, 4 - Capture the Flag +set g_gametype 0 //- Sets the type of game. 0 - Free for all, 1 - Tournament, 2 - Free for all(again), 3 - Team Deathmatch, 4 - Capture the Flag set fraglimit 50 set timelimit 20 From 1f0c6d96030c337f1e6a8d03df06d2fde374882f Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 02:43:31 +0200 Subject: [PATCH 009/114] First shot for #1098 --- lgsm/functions/command_backup.sh | 55 +++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index ca6fe9607..369228ab1 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -9,10 +9,24 @@ local commandaction="Backup" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh +# Check if a backup is pending or has been aborted using .backup.lock +if [ -f "${tmdpdir}/.backup.lock" ]; then + fn_print_warning_nl "A backup is currently pending or has been aborted." + while true; do + read -e -i "y" -p "Continue anyway? [Y/N]" yn + case $yn in + [Yy]* ) break;; + [Nn]* ) echo Exiting; return;; + * ) echo "Please answer yes or no.";; + esac + done +fi info_distro.sh -backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" fn_print_dots "" sleep 0.5 +# Prepare backup file name with servicename current date +backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" +# Tells how much will be compressed using rootdirduexbackup value from info_distro fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" echo "${backupdir}/${backupname}.tar.gz" echo "" @@ -33,8 +47,8 @@ if [ "${status}" != "0" ]; then while true; do read -p "Stop ${servicename} while running the backup? [Y/N]" yn case $yn in - [Yy]* ) command_stop.sh; break;; - [Nn]* ) break;; + [Yy]* ) command_stop.sh; serverstopped="yes"; break;; + [Nn]* ) serverstopped="no"; break;; * ) echo "Please answer yes or no.";; esac done @@ -42,14 +56,47 @@ fi fn_print_dots "Backup in progress, please wait..." fn_script_log_info "Started backup" -sleep 2 +sleep 1 if [ ! -d "${backupdir}" ]; then mkdir "${backupdir}" fi +# Create lockfile +touch "${tmdpdir}/.backup.lock" +# Compressing files tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* +# Remove lockfile +rm "${tmdpdir}/.backup.lock" +# Check tar exit code and act accordingly if [ $? == 0 ]; then fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" fn_script_log_pass "Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" + + # Clear old backups if backupdays variable exists + if [ -n "${backupdays}" ]; then + # Count how many backups can be cleared + backupclearcount=$(find "${backupdir}"/ -type f -mtime +"${backupdays}"|wc -l) + # Check if there is any backup to clear + if [ "${backupclearcount}" -ne "0" ]; then + fn_print_info_nl "${backupclearcount} backups older than ${backupdays} days can be cleared." + while true; do + read -p "Clear older backups? [Y/N]" yn + case $yn in + [Yy]* ) clearoldbackups="yes"; break;; + [Nn]* ) clearoldbackups="no"; break;; + * ) echo "Please answer yes or no.";; + esac + done + # If user wants to clear backups + if [ "${clearoldbackups}" == "yes" ]; then + find "${backupdir}"/ -mtime +"${backupdays}" -type f -exec rm -f {} \; + fn_print_ok_nl "Cleared ${backupclearcount} backups." + fi + fi + fi + # Restart the server if it was stopped for the backup + if [ "${serverstopped}" == "yes" ]; then + command_start.sh + fi else fn_print_error_nl "Backup failed: ${backupname}.tar.gz" fn_script_log_error "Backup failed: ${backupname}.tar.gz" From 119a2cefa0432e4e5a2b429b1a9a991490f583e5 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 02:55:23 +0200 Subject: [PATCH 010/114] typo and spacing --- lgsm/functions/command_backup.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 369228ab1..cdcb51856 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -9,8 +9,9 @@ local commandaction="Backup" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh +backuplock= # Check if a backup is pending or has been aborted using .backup.lock -if [ -f "${tmdpdir}/.backup.lock" ]; then +if [ -f "${tmpdir}/.backup.lock" ]; then fn_print_warning_nl "A backup is currently pending or has been aborted." while true; do read -e -i "y" -p "Continue anyway? [Y/N]" yn @@ -29,7 +30,6 @@ backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" # Tells how much will be compressed using rootdirduexbackup value from info_distro fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" echo "${backupdir}/${backupname}.tar.gz" -echo "" while true; do read -e -i "y" -p "Continue? [Y/N]" yn case $yn in @@ -38,7 +38,6 @@ while true; do * ) echo "Please answer yes or no.";; esac done -echo "" check_status.sh if [ "${status}" != "0" ]; then echo "" @@ -61,11 +60,11 @@ if [ ! -d "${backupdir}" ]; then mkdir "${backupdir}" fi # Create lockfile -touch "${tmdpdir}/.backup.lock" +touch "${tmpdir}/.backup.lock" # Compressing files tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* # Remove lockfile -rm "${tmdpdir}/.backup.lock" +rm "${tmpdir}/.backup.lock" # Check tar exit code and act accordingly if [ $? == 0 ]; then fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" @@ -101,6 +100,5 @@ else fn_print_error_nl "Backup failed: ${backupname}.tar.gz" fn_script_log_error "Backup failed: ${backupname}.tar.gz" fi -sleep 1 -echo "" +sleep 0.5 core_exit.sh From f7571bd13916bcfc338f55e408903d814136a724 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 03:09:04 +0200 Subject: [PATCH 011/114] empty variable --- lgsm/functions/command_backup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index cdcb51856..3cd3b7d44 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -9,7 +9,6 @@ local commandaction="Backup" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh -backuplock= # Check if a backup is pending or has been aborted using .backup.lock if [ -f "${tmpdir}/.backup.lock" ]; then fn_print_warning_nl "A backup is currently pending or has been aborted." From 4c8b1f45a2bc9d8d548262073c39f8ba215e1ef8 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 03:27:21 +0200 Subject: [PATCH 012/114] If there are backups in backup dir. Fixes #1140 --- lgsm/functions/info_distro.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh index a203a2c47..3416e8133 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -105,19 +105,21 @@ fi ## Backup info if [ -d "${backupdir}" ]; then - # used space in backups dir. + # Ued space in backups dir. backupdirdu=$(du -sh "${backupdir}" | awk '{print $1}') + # If no backup dir, size is 0M if [ -z "${backupdirdu}" ]; then backupdirdu="0M" fi - - # number of backups. - backupcount=$(find "${backupdir}"/*.tar.gz | wc -l) - # most recent backup. - lastbackup=$(ls -t "${backupdir}"/*.tar.gz | head -1) - # date of most recent backup. - lastbackupdate=$(date -r "${lastbackup}") - # size of most recent backup. - lastbackupsize=$(du -h "${lastbackup}" | awk '{print $1}') - + # If there are backups in backup dir. + if [ $(find "${backupdir}" -name "*.tar.gz" | wc -l) -ne "0" ]; then + # number of backups. + backupcount=$(find "${backupdir}"/*.tar.gz | wc -l) + # most recent backup. + lastbackup=$(ls -t "${backupdir}"/*.tar.gz | head -1) + # date of most recent backup. + lastbackupdate=$(date -r "${lastbackup}") + # size of most recent backup. + lastbackupsize=$(du -h "${lastbackup}" | awk '{print $1}') + fi fi From 13f5f661b1777ce4832b5c898e6a3c0c00bd5acd Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 15:01:22 +0200 Subject: [PATCH 013/114] mainly imrpoves logging #1098 --- lgsm/functions/command_backup.sh | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 3cd3b7d44..ea51fe415 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -9,38 +9,43 @@ local commandaction="Backup" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh +fn_print_header # Check if a backup is pending or has been aborted using .backup.lock if [ -f "${tmpdir}/.backup.lock" ]; then - fn_print_warning_nl "A backup is currently pending or has been aborted." + fn_print_warning_nl "A backup is currently running or has been aborted." + fn_script_log_warn "A backup is currently running or has been aborted." while true; do read -e -i "y" -p "Continue anyway? [Y/N]" yn case $yn in - [Yy]* ) break;; - [Nn]* ) echo Exiting; return;; + [Yy]* ) fn_script_log "User continues anyway"; break;; + [Nn]* ) echo Exiting; fn_script_log "User aborted"; return;; * ) echo "Please answer yes or no.";; esac done fi -info_distro.sh fn_print_dots "" sleep 0.5 # Prepare backup file name with servicename current date backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" -# Tells how much will be compressed using rootdirduexbackup value from info_distro +# Tells how much will be compressed using rootdirduexbackup value from info_distro and prompt for continue +info_distro.sh fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" echo "${backupdir}/${backupname}.tar.gz" while true; do read -e -i "y" -p "Continue? [Y/N]" yn case $yn in [Yy]* ) break;; - [Nn]* ) echo Exiting; return;; + [Nn]* ) echo "Exiting"; fn_script_log "User aborted"; return;; * ) echo "Please answer yes or no.";; esac done + +# Check if server is started check_status.sh if [ "${status}" != "0" ]; then echo "" fn_print_warning_nl "${servicename} is currently running." + sleep 1 while true; do read -p "Stop ${servicename} while running the backup? [Y/N]" yn @@ -60,12 +65,16 @@ if [ ! -d "${backupdir}" ]; then fi # Create lockfile touch "${tmpdir}/.backup.lock" +fn_script_log "Lockfile created" # Compressing files +fn_script_log "Compressing ${rootdirduexbackup}". tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* # Remove lockfile rm "${tmpdir}/.backup.lock" +fn_script_log "Lockfile removed" # Check tar exit code and act accordingly if [ $? == 0 ]; then + # Exit code doesn't report any error fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" fn_script_log_pass "Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" @@ -76,11 +85,12 @@ if [ $? == 0 ]; then # Check if there is any backup to clear if [ "${backupclearcount}" -ne "0" ]; then fn_print_info_nl "${backupclearcount} backups older than ${backupdays} days can be cleared." + fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared." while true; do read -p "Clear older backups? [Y/N]" yn case $yn in [Yy]* ) clearoldbackups="yes"; break;; - [Nn]* ) clearoldbackups="no"; break;; + [Nn]* ) clearoldbackups="no"; fn_script_log "User didn't clear backups"; break;; * ) echo "Please answer yes or no.";; esac done @@ -96,6 +106,7 @@ if [ $? == 0 ]; then command_start.sh fi else + # Exit code reports an error fn_print_error_nl "Backup failed: ${backupname}.tar.gz" fn_script_log_error "Backup failed: ${backupname}.tar.gz" fi From 7df6c286e231c70cdc6459382578aafef7a91930 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 15:42:47 +0200 Subject: [PATCH 014/114] Better logging, output & compatibility #1098 Also improved compatibility with older lgsm versions Commit for testing --- lgsm/functions/command_backup.sh | 51 ++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index ea51fe415..63cef9b42 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -10,6 +10,7 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh fn_print_header +fn_script_log "Backup initiated" # Check if a backup is pending or has been aborted using .backup.lock if [ -f "${tmpdir}/.backup.lock" ]; then fn_print_warning_nl "A backup is currently running or has been aborted." @@ -22,6 +23,7 @@ if [ -f "${tmpdir}/.backup.lock" ]; then * ) echo "Please answer yes or no.";; esac done +echo "" fi fn_print_dots "" sleep 0.5 @@ -30,11 +32,13 @@ backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" # Tells how much will be compressed using rootdirduexbackup value from info_distro and prompt for continue info_distro.sh fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" +fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup:" echo "${backupdir}/${backupname}.tar.gz" +echo "" while true; do - read -e -i "y" -p "Continue? [Y/N]" yn + read -e -i "y" -p "Continue? [Y/n]" yn case $yn in - [Yy]* ) break;; + [Yy]* ) fn_script_log "User validates"; break;; [Nn]* ) echo "Exiting"; fn_script_log "User aborted"; return;; * ) echo "Please answer yes or no.";; esac @@ -45,13 +49,13 @@ check_status.sh if [ "${status}" != "0" ]; then echo "" fn_print_warning_nl "${servicename} is currently running." - + fin_script_log_warning "${servicename} is currently running." sleep 1 while true; do - read -p "Stop ${servicename} while running the backup? [Y/N]" yn + read -p -e -i "n" "Stop ${servicename} while running the backup? [y/N]" yn case $yn in - [Yy]* ) command_stop.sh; serverstopped="yes"; break;; - [Nn]* ) serverstopped="no"; break;; + [Yy]* ) fn_script_log "Stopping the server"; command_stop.sh; serverstopped="yes"; break;; + [Nn]* ) fn_script_log "Not stopping the server"; serverstopped="no"; break;; * ) echo "Please answer yes or no.";; esac done @@ -60,18 +64,36 @@ fi fn_print_dots "Backup in progress, please wait..." fn_script_log_info "Started backup" sleep 1 + +# Directories creation +# Create backupdir if it doesn't exist if [ ! -d "${backupdir}" ]; then + fn_print_info_nl "Creating ${backupdir}" + fn_script_log_info "Creating ${backupdir}" mkdir "${backupdir}" fi +# Create tmpdir if it doesn't exist +if [ -n "${tmpdir}" ]&&[ ! -d "${tmpdir}" ]; then + fn_print_info_nl "Creating ${tmpdir}" + fn_script_log "Creating ${tmpdir}" + mkdir -p "${tmpdir}" +fi # Create lockfile -touch "${tmpdir}/.backup.lock" -fn_script_log "Lockfile created" +if [ -d "${tmpdir}" ]; then + touch "${tmpdir}/.backup.lock" + fn_script_log "Lockfile created" +fi + # Compressing files fn_script_log "Compressing ${rootdirduexbackup}". tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* + # Remove lockfile -rm "${tmpdir}/.backup.lock" -fn_script_log "Lockfile removed" +if [ -d "${tmpdir}" ]; then + rm "${tmpdir}/.backup.lock" + fn_script_log "Lockfile removed" +fi + # Check tar exit code and act accordingly if [ $? == 0 ]; then # Exit code doesn't report any error @@ -87,10 +109,10 @@ if [ $? == 0 ]; then fn_print_info_nl "${backupclearcount} backups older than ${backupdays} days can be cleared." fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared." while true; do - read -p "Clear older backups? [Y/N]" yn + read -p -e"Clear older backups? [Y/N]" yn case $yn in [Yy]* ) clearoldbackups="yes"; break;; - [Nn]* ) clearoldbackups="no"; fn_script_log "User didn't clear backups"; break;; + [Nn]* ) clearoldbackups="no"; fn_script_log "Not clearing backups"; break;; * ) echo "Please answer yes or no.";; esac done @@ -98,8 +120,13 @@ if [ $? == 0 ]; then if [ "${clearoldbackups}" == "yes" ]; then find "${backupdir}"/ -mtime +"${backupdays}" -type f -exec rm -f {} \; fn_print_ok_nl "Cleared ${backupclearcount} backups." + fn_script_log_pass "Cleared ${backupclearcount} backups." fi + else + fn_script_log "No backups older than ${backupdays} days were found." fi + else + fn_script_log "No backups to clear since backupdays variable is empty." fi # Restart the server if it was stopped for the backup if [ "${serverstopped}" == "yes" ]; then From 98614ce2402a4b44728e977368d803a883f051ba Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 16:07:08 +0200 Subject: [PATCH 015/114] typo & prompt fixes --- lgsm/functions/command_backup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 63cef9b42..e84a7b7b1 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -49,10 +49,10 @@ check_status.sh if [ "${status}" != "0" ]; then echo "" fn_print_warning_nl "${servicename} is currently running." - fin_script_log_warning "${servicename} is currently running." + fn_script_log_warn "${servicename} is currently running." sleep 1 while true; do - read -p -e -i "n" "Stop ${servicename} while running the backup? [y/N]" yn + read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn case $yn in [Yy]* ) fn_script_log "Stopping the server"; command_stop.sh; serverstopped="yes"; break;; [Nn]* ) fn_script_log "Not stopping the server"; serverstopped="no"; break;; From 22e92085e0d95fbcc33ba0ff4c1bf623276415f4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 16:27:56 +0200 Subject: [PATCH 016/114] logging & delays --- lgsm/functions/command_backup.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index e84a7b7b1..d094f39e9 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -10,7 +10,7 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh fn_print_header -fn_script_log "Backup initiated" +fn_script_log "Entering backup" # Check if a backup is pending or has been aborted using .backup.lock if [ -f "${tmpdir}/.backup.lock" ]; then fn_print_warning_nl "A backup is currently running or has been aborted." @@ -32,7 +32,7 @@ backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" # Tells how much will be compressed using rootdirduexbackup value from info_distro and prompt for continue info_distro.sh fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" -fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup:" +fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup: ${backupdir}/${backupname}.tar.gz" echo "${backupdir}/${backupname}.tar.gz" echo "" while true; do @@ -50,20 +50,20 @@ if [ "${status}" != "0" ]; then echo "" fn_print_warning_nl "${servicename} is currently running." fn_script_log_warn "${servicename} is currently running." - sleep 1 + sleep 0.5 while true; do read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn case $yn in - [Yy]* ) fn_script_log "Stopping the server"; command_stop.sh; serverstopped="yes"; break;; - [Nn]* ) fn_script_log "Not stopping the server"; serverstopped="no"; break;; + [Yy]* ) fn_script_log "User choose to stop the server"; command_stop.sh; serverstopped="yes"; break;; + [Nn]* ) fn_script_log "User choose to not stop the server"; serverstopped="no"; break;; * ) echo "Please answer yes or no.";; esac done fi fn_print_dots "Backup in progress, please wait..." -fn_script_log_info "Started backup" -sleep 1 +fn_script_log_info "Initiating backup" +sleep 0.5 # Directories creation # Create backupdir if it doesn't exist @@ -85,8 +85,9 @@ if [ -d "${tmpdir}" ]; then fi # Compressing files -fn_script_log "Compressing ${rootdirduexbackup}". +fn_script_log "Compressing ${rootdirduexbackup}..." tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* +fn_script_log "Compression over." # Remove lockfile if [ -d "${tmpdir}" ]; then From 0ce093960787e0d9af8c8fba1f7733cc17ba9afb Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 16:35:26 +0200 Subject: [PATCH 017/114] exitbypass=1 --- lgsm/functions/command_backup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index d094f39e9..fa2c9dd7e 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -54,7 +54,7 @@ if [ "${status}" != "0" ]; then while true; do read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn case $yn in - [Yy]* ) fn_script_log "User choose to stop the server"; command_stop.sh; serverstopped="yes"; break;; + [Yy]* ) exitbypass=1; fn_script_log "User choose to stop the server"; command_stop.sh; serverstopped="yes"; break;; [Nn]* ) fn_script_log "User choose to not stop the server"; serverstopped="no"; break;; * ) echo "Please answer yes or no.";; esac @@ -131,6 +131,7 @@ if [ $? == 0 ]; then fi # Restart the server if it was stopped for the backup if [ "${serverstopped}" == "yes" ]; then + exitbypass=1 command_start.sh fi else From 645bd18e2c5c002cd29b1b40ee50486584f0b12b Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 16:49:11 +0200 Subject: [PATCH 018/114] removed ending dots in script logs --- lgsm/functions/command_backup.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index fa2c9dd7e..44cf937a3 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -14,7 +14,7 @@ fn_script_log "Entering backup" # Check if a backup is pending or has been aborted using .backup.lock if [ -f "${tmpdir}/.backup.lock" ]; then fn_print_warning_nl "A backup is currently running or has been aborted." - fn_script_log_warn "A backup is currently running or has been aborted." + fn_script_log_warn "A backup is currently running or has been aborted" while true; do read -e -i "y" -p "Continue anyway? [Y/N]" yn case $yn in @@ -49,7 +49,7 @@ check_status.sh if [ "${status}" != "0" ]; then echo "" fn_print_warning_nl "${servicename} is currently running." - fn_script_log_warn "${servicename} is currently running." + fn_script_log_warn "${servicename} is currently running" sleep 0.5 while true; do read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn @@ -85,9 +85,9 @@ if [ -d "${tmpdir}" ]; then fi # Compressing files -fn_script_log "Compressing ${rootdirduexbackup}..." +fn_script_log "Compressing ${rootdirduexbackup}" tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* -fn_script_log "Compression over." +fn_script_log "Compression over" # Remove lockfile if [ -d "${tmpdir}" ]; then @@ -108,7 +108,7 @@ if [ $? == 0 ]; then # Check if there is any backup to clear if [ "${backupclearcount}" -ne "0" ]; then fn_print_info_nl "${backupclearcount} backups older than ${backupdays} days can be cleared." - fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared." + fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared" while true; do read -p -e"Clear older backups? [Y/N]" yn case $yn in @@ -121,13 +121,13 @@ if [ $? == 0 ]; then if [ "${clearoldbackups}" == "yes" ]; then find "${backupdir}"/ -mtime +"${backupdays}" -type f -exec rm -f {} \; fn_print_ok_nl "Cleared ${backupclearcount} backups." - fn_script_log_pass "Cleared ${backupclearcount} backups." + fn_script_log_pass "Cleared ${backupclearcount} backups" fi else - fn_script_log "No backups older than ${backupdays} days were found." + fn_script_log "No backups older than ${backupdays} days were found" fi else - fn_script_log "No backups to clear since backupdays variable is empty." + fn_script_log "No backups to clear since backupdays variable is empty" fi # Restart the server if it was stopped for the backup if [ "${serverstopped}" == "yes" ]; then From d3c94296448f3cc77b83043febd4047e53384f66 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:22:44 +0200 Subject: [PATCH 019/114] backupdays --- 7DaysToDie/sdtdserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 07f7d555d..b6b6566b9 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -77,6 +77,9 @@ servercfg="${servicename}.xml" servercfgdefault="serverconfig.xml" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 1f571390f81332bf48e842820ee494663b087d26 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:33:29 +0200 Subject: [PATCH 020/114] backupdays --- ARKSurvivalEvolved/arkserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index efba11b51..5c3cf7756 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -82,6 +82,9 @@ servercfgdir="${systemdir}/Saved/Config/LinuxServer" servercfg="GameUserSettings.ini" servercfgfullpath="${servercfgdir}/${servercfg}" servercfgdefault="${servercfgdir}/GameUserSettings.ini" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From be6e70b850a55d5dca75787678d9773316f57684 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:33:35 +0200 Subject: [PATCH 021/114] backupdays --- Arma3/arma3server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Arma3/arma3server b/Arma3/arma3server index 62a760104..c7ec8d559 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -96,6 +96,9 @@ networkcfgdefault="network.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" networkcfgfullpath="${servercfgdir}/${networkcfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 35919b306c493b09090ae25a5c2fe5a5eedf1561 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:33:42 +0200 Subject: [PATCH 022/114] backupdays --- Battlefield1942/bf1942server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index 14995f4cf..fbcf44b1d 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -62,6 +62,9 @@ servercfg="serversettings.con" servercfgdefault="serversettings.con" servercfgdir="${systemdir}/mods/bf1942/settings" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 4ffe0bc1fe993e57cdec1c31502d5937a2a0eb90 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:33:47 +0200 Subject: [PATCH 023/114] backupdays --- BlackMesa/bmdmserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 91fe6bb56..3fa69a53b 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -87,6 +87,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 25ee4c169f1adae98d0598c7516295a7a7cc3b65 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:33:51 +0200 Subject: [PATCH 024/114] backupdays --- BladeSymphony/bsserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index e5e071271..e2eb22b59 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -82,6 +82,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 4a77b3767ce7fbc597474f33833742a289270ab0 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:33:57 +0200 Subject: [PATCH 025/114] backupdays --- BrainBread2/bb2server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 8ff2d159c..41e46fa83 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -87,6 +87,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 8fd184f1338eaf1b2cfd0402f98d61ab2d1504dc Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:00 +0200 Subject: [PATCH 026/114] backupdays --- CodenameCURE/ccserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index 3473eed80..91450d6c2 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -82,6 +82,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 90b45e98ba1ba815475b46b646fbb24ddbfb62b5 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:05 +0200 Subject: [PATCH 027/114] backupdays --- CounterStrike/csserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CounterStrike/csserver b/CounterStrike/csserver index e2cdde7fc..3bb94ac05 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 7caab2b27ae182feae81051e48bdaa8aa93c2c1f Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:10 +0200 Subject: [PATCH 028/114] backupdays --- CounterStrikeConditionZero/csczserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 895ec1583..57cd67cca 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From f8b9c21ceb8e09a6b2085eafe398b6c0c8302ccd Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:18 +0200 Subject: [PATCH 029/114] backupdays --- CounterStrikeGlobalOffensive/csgoserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 87425d00a..58940d70d 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -105,6 +105,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 18f5b5637b9994e4058aec486bda83d922ca6ea4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:22 +0200 Subject: [PATCH 030/114] backupdays --- CounterStrikeSource/cssserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index e6994789e..847f7051a 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -87,6 +87,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 53e1e29d6c27edb96630248afed784da078d2a82 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:25 +0200 Subject: [PATCH 031/114] backupdays --- DayOfDefeat/dodserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index f6cd2b34e..726cef2d4 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 6a57124fd80321c8a8b17d8d1c3f66adfb112a2d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:31 +0200 Subject: [PATCH 032/114] backupdays --- DayOfDefeatSource/dodsserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 342ccc97a..c2f093202 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -82,6 +82,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 8d8a490bf4bad800a20cbeca52042b9920058797 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:34 +0200 Subject: [PATCH 033/114] backupdays --- DayOfInfamy/doiserver | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index 7440b369f..bec8d423f 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -84,6 +84,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging @@ -162,4 +165,4 @@ core_dl.sh core_functions.sh getopt=$1 -core_getopt.sh \ No newline at end of file +core_getopt.sh From 7fc7e16a0eb0f6aba0d1ebf3d4918ef17f69e371 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:39 +0200 Subject: [PATCH 034/114] backupdays --- DeathmatchClassic/dmcserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index b987c9685..6d2304e78 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 10670ee0bc3e113b275143eafa97423c2b5d8b47 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:43 +0200 Subject: [PATCH 035/114] backupdays --- DontStarveTogether/dstserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index e96d304b8..2066df512 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -81,6 +81,9 @@ servercfgdefault="settings.ini" servercfgdir="${HOME}/.klei/DoNotStarveTogether" servercfgfullpath="${servercfgdir}/${servercfg}" servercfgdefault="${servercfgdir}/lgsm-default.ini" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 7a06377eeb6b83671fdb5dcfe691313138fa9d21 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:46 +0200 Subject: [PATCH 036/114] backupdays --- DoubleActionBoogaloo/dabserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index 4b8b531e9..a7e753897 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -82,6 +82,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 07fbeccc0ec943964a74844a0c9c7864d3885167 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:48 +0200 Subject: [PATCH 037/114] backupdays --- EmpiresMod/emserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index 20e28b2d4..37b746012 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -87,6 +87,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 59304c3343aa9cebaa63d5d5ddd0a46bfe4907e3 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:50 +0200 Subject: [PATCH 038/114] backupdays --- FistfulOfFrags/fofserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 8a9fa69c5..9d89c5975 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -82,6 +82,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From f90af8128907aeb4bafc9aa050cf4e2f34de1ef3 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:52 +0200 Subject: [PATCH 039/114] backupdays --- GarrysMod/gmodserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index edc225016..257643966 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -104,6 +104,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 9b6ecf4a40dbf233b0077ca6367beb9b96805858 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:55 +0200 Subject: [PATCH 040/114] backupdays --- GoldenEyeSource/gesserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index 081362d2a..c1e12f2ce 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From ff074848734e9721292c7861806603c472608ef7 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:56 +0200 Subject: [PATCH 041/114] backupdays --- HalfLife2Deathmatch/hl2dmserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index ff324c434..77ff51fe5 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From c5cfb126406bd5a026faa6699aed198b34423c26 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:34:58 +0200 Subject: [PATCH 042/114] backupdays --- HalfLifeDeathmatch/hldmserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 2716a27e9..8138ba5c3 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -76,6 +76,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 3824ba8aa4f66ea5edc4eece6ad3852aab830c1d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:00 +0200 Subject: [PATCH 043/114] backupdays --- HalfLifeDeathmatchSource/hldmsserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 0a45df162..e8c0fdaac 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 8b44d030f9c3069554c3903ae8b4d9350e5814d5 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:02 +0200 Subject: [PATCH 044/114] backupdays --- Hurtworld/hwserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 2e28481b6..64d6c70f9 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -96,6 +96,9 @@ if [ "${x64mode}" == "1" ]; then else executable="./Hurtworld.x86" fi + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 2e98ce19c2854da40f5f0f1afa3612da0d0b9332 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:04 +0200 Subject: [PATCH 045/114] backupdays --- Insurgency/insserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Insurgency/insserver b/Insurgency/insserver index ba49fb494..67069ed4e 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -84,6 +84,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 1b248733fa261c104c631c2e3a33b87d4d8dfa36 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:06 +0200 Subject: [PATCH 046/114] backupdays --- JustCause2/jc2server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/JustCause2/jc2server b/JustCause2/jc2server index af5e1e0af..e23bd6340 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -75,6 +75,9 @@ servercfg="config.lua" servercfgdefault="config.lua" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 11a172e7043e27c9709c04df0e9938f4d974340c Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:08 +0200 Subject: [PATCH 047/114] backupdays --- KillingFloor/kfserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 09ad60899..1bcc2d721 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -82,6 +82,9 @@ servercfgdefault="Default.ini" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From f98817f78ca16e789380cd05a7492fa4cc320d49 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:10 +0200 Subject: [PATCH 048/114] backupdays --- Left4Dead/l4dserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index d05cd9a79..bcf389a35 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -82,6 +82,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From ce6c7afe651d89f562ffb3828c9d94bf9b5b3456 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:12 +0200 Subject: [PATCH 049/114] backupdays --- Left4Dead2/l4d2server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index bddcaae9e..e5066d86b 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -81,6 +81,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 0f7ee2834f5619be31e471eb6fb7c47d28d80179 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:14 +0200 Subject: [PATCH 050/114] backupdays --- Minecraft/mcserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Minecraft/mcserver b/Minecraft/mcserver index 6317fb9bc..cbf68024f 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -63,6 +63,9 @@ servercfgdefault="server.properties" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" servercfgdefault="${servercfgdir}/lgsm-default.ini" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 64b750b23820054fb470535f2c12717094ff585e Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:16 +0200 Subject: [PATCH 051/114] backupdays --- Mumble/mumbleserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index 9e2b022ec..e774cea7d 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -63,6 +63,9 @@ servercfg="${servicename}.ini" servercfgdefault="murmur.ini" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From c46e6586702fb0c91fcc4e4277c8204362b9c8ce Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:17 +0200 Subject: [PATCH 052/114] backupdays --- NS2Combat/ns2cserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 4dbc1e276..772522815 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -88,6 +88,9 @@ executable="./ns2combatserver_linux32" servercfgdir="${rootdir}/server1" servercfgfullpath="${servercfgdir}" modstoragedir="${servercfgdir}/Workshop" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 0059a17500dc36c61b78d3cbbfd0de02e2e74afe Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:19 +0200 Subject: [PATCH 053/114] backupdays --- NaturalSelection2/ns2server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 54b6ed226..967a4715f 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -88,6 +88,9 @@ executable="./server_linux32" servercfgdir="${rootdir}/server1" servercfgfullpath="${servercfgdir}" modstoragedir="${servercfgdir}/Workshop" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 98afad6428b573b46072f042913bfd26d7c20a4b Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:21 +0200 Subject: [PATCH 054/114] backupdays --- NoMoreRoomInHell/nmrihserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index be02bfc0e..4c9f3044e 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -87,6 +87,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 93e4b68f735a78e580d91dd9401caba3d11b0088 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:23 +0200 Subject: [PATCH 055/114] backupdays --- OpposingForce/opforserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 5013110e2..597f82a69 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 59afb067bde43741a59c4ace44ae9478fa94030c Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:25 +0200 Subject: [PATCH 056/114] backupdays --- PiratesVikingandKnightsII/pvkiiserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index 5074af33e..5192f77a2 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -82,6 +82,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From c0aa39a746f6c310220705a94f3aac533883f11a Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:26 +0200 Subject: [PATCH 057/114] backupdays --- ProjectZomboid/pzserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 143c382c6..2e898f041 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -78,6 +78,9 @@ servercfg="server.ini" servercfgdefault="server.cfg" servercfgdir="${HOME}/Zomboid/Server" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 2f2cefa2e5ae641ba90c16c59ed10b12d79d9565 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:29 +0200 Subject: [PATCH 058/114] backupdays --- QuakeLive/qlserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index accf6aadf..44246a67f 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -85,6 +85,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${filesdir}/baseq3" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 2a2dd575eeed5d8ab191b4fa34fb89e48807fe84 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:31 +0200 Subject: [PATCH 059/114] backupdays --- RedOrchestra/roserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 66b85d98e..c2c4eaa4f 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -73,6 +73,9 @@ servercfgdefault="default.ini" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 3812ba8b81a9bd42e8878e726846c96bbbe46760 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:34 +0200 Subject: [PATCH 060/114] backupdays --- Ricochet/ricochetserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index ff5862808..ee538a8e2 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From a7ea1d34707af1100ae8275e528e5c6e89704f15 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:36 +0200 Subject: [PATCH 061/114] backupdays --- Rust/rustserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rust/rustserver b/Rust/rustserver index 6e5f8f76a..7d515b1f0 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -100,6 +100,9 @@ servercfg="server.cfg" servercfgdefault="server.cfg" servercfgdir="${serveridentitydir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 9a470af641dc62fb83aa7c01f30cf88740e0e74d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:38 +0200 Subject: [PATCH 062/114] backupdays --- SeriousSam3BFE/ss3sserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index 35b78d831..56f7f5bd9 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -77,6 +77,9 @@ servercfg="${servicename}.ini" servercfgdefault="server.ini" servercfgdir="${filesdir}/Content/SeriousSam3/Config" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From dda4a24cc22d8761fbd45afc33acf4d07cb03ad3 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:39 +0200 Subject: [PATCH 063/114] backupdays --- Starbound/sbserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Starbound/sbserver b/Starbound/sbserver index 197d93ee3..cc6a1f462 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -76,6 +76,9 @@ servercfg="starbound_server.config" servercfgdefault="starbound_server.config" servercfgdir="${filesdir}/storage" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From b1a9dfe25f92a0a8ed2a8ccf84d1d04cc1438295 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:41 +0200 Subject: [PATCH 064/114] backupdays --- SvenCoop/svenserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index c89ffb88d..a27645c02 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -81,6 +81,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 6c0dbdbd1b3de79725d89f10e02531f3a740cf56 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:43 +0200 Subject: [PATCH 065/114] backupdays --- TeamFortress2/tf2server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 972e60903..1255ad0b5 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -87,6 +87,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From d0d31d4ed3d4b7f78db52981b264264836b67f08 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:45 +0200 Subject: [PATCH 066/114] backupdays --- TeamFortressClassic/tfcserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 4a9496d35..5cbb7dcb4 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -77,6 +77,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From bedc7e048a8e7446913131e1efd8091db624c965 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:46 +0200 Subject: [PATCH 067/114] backupdays --- TeamSpeak3/ts3server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index 2c0af6bd5..fb8d4e24b 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -50,6 +50,9 @@ servercfg="${servicename}.ini" servercfgdefault="ts3server.ini" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 9e9b9b026ffe5ddad97fdbba3b538f41e75a82b7 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:48 +0200 Subject: [PATCH 068/114] backupdays --- Teeworlds/twserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Teeworlds/twserver b/Teeworlds/twserver index 8ab31bbcb..4010ea6b3 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -72,6 +72,9 @@ servercfg="${servicename}.cfg" # Teeworlds can also auto load any config if an a servercfgdefault="server.cfg" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 8ffda2dc7ba04a90d944f298968d19f84aab10af Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:50 +0200 Subject: [PATCH 069/114] backupdays --- Terraria/terrariaserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index fba75083f..d0564fb87 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -72,6 +72,9 @@ servercfg="${servicename}.txt" servercfgdefault="serverconfig.txt" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From 54009dbf97722887c508fbc7f17ec477014a58a4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:52 +0200 Subject: [PATCH 070/114] backupdays --- UnrealTournament/utserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index a5ff70a61..fd20b128a 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -68,6 +68,9 @@ executable="./UE4Server-Linux-Shipping" servercfg="Game.ini" servercfgdir="${systemdir}/UnrealTournament/Saved/Config/LinuxServer" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From cb79093598de58ae16f827bf453abc96a93cfa34 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:53 +0200 Subject: [PATCH 071/114] backupdays --- UnrealTournament2004/ut2k4server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index 3c82b7e7b..c86b2f824 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -56,6 +56,9 @@ servercfgdefault="UT2004.ini" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From f1307331c99b5abc56e3dacdb878ed863e875588 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:55 +0200 Subject: [PATCH 072/114] backupdays --- UnrealTournament3/ut3server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index 780da1fb8..21e8ba06f 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -76,6 +76,9 @@ servercfg="${servicename}.ini" servercfgdefault="UTGame.ini" servercfgdir="${systemdir}/UTGame/Config" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From e43e8349d606d0404f5d64792202502d2977dae6 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:57 +0200 Subject: [PATCH 073/114] backupdays --- UnrealTournament99/ut99server | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 771882279..388b03e25 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -65,6 +65,9 @@ servercfgdefault="Default.ini" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From f7f8c7f536fb3dc8d9f57b4f53026454147a86c4 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:35:59 +0200 Subject: [PATCH 074/114] backupdays --- WolfensteinEnemyTerritory/wetserver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index 35642cdd6..16358debe 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -62,6 +62,9 @@ servercfg="${servicename}.cfg" servercfgdefault="server.cfg" servercfgdir="${systemdir}/etmain" servercfgfullpath="${servercfgdir}/${servercfg}" + +# Backup +backupdays="30" backupdir="${rootdir}/backups" # Logging From ea8fede3e8e736018f5580b1d9f6ba43de8da97e Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 17:49:21 +0200 Subject: [PATCH 075/114] fn_check_cfgdir for Rust fixes #1141 --- lgsm/functions/install_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 5c241aec5..4a036eabc 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -307,6 +307,7 @@ elif [ "${gamename}" == "Ricochet" ]; then fn_set_config_vars elif [ "${gamename}" == "Rust" ]; then gamedirname="Rust" + fn_check_cfgdir array_configs+=( server.cfg ) fn_fetch_default_config fn_default_config_remote @@ -390,4 +391,3 @@ elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then fn_default_config_remote fn_set_config_vars fi - From 1752d79d197ba8896e3b7a462a1f6f97d2c5dacb Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 18:03:25 +0200 Subject: [PATCH 076/114] fn_set_config_vars is not for every game removing some games i know don't use it --- lgsm/functions/install_config.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 4a036eabc..a94183499 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -274,7 +274,6 @@ elif [ "${gamename}" == "Mumble" ]; then array_configs+=( murmur.ini ) fn_fetch_default_config fn_default_config_remote - fn_set_config_vars elif [ "${gamename}" == "Natural Selection 2" ]; then : elif [ "${gamename}" == "NS2: Combat" ]; then @@ -311,7 +310,6 @@ elif [ "${gamename}" == "Rust" ]; then array_configs+=( server.cfg ) fn_fetch_default_config fn_default_config_remote - fn_set_config_vars elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then gamedirname="SeriousSam3BFE" array_configs+=( server.ini ) @@ -347,7 +345,6 @@ elif [ "${gamename}" == "TeamSpeak 3" ]; then array_configs+=( ts3server.ini ) fn_fetch_default_config fn_default_config_remote - fn_set_config_vars elif [ "${gamename}" == "Teeworlds" ]; then gamedirname="Teeworlds" array_configs+=( server.cfg ctf.cfg dm.cfg duel.cfg tdm.cfg ) From 63a040cf83f64fb56e9efb12ae686987c528f7d9 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 18:12:33 +0200 Subject: [PATCH 077/114] Install config if missing fixes #1142 --- lgsm/functions/check_config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/check_config.sh b/lgsm/functions/check_config.sh index 9ad4c7baa..72ea95c5c 100644 --- a/lgsm/functions/check_config.sh +++ b/lgsm/functions/check_config.sh @@ -15,7 +15,8 @@ if [ ! -e "${servercfgfullpath}" ]; then echo "${servercfgfullpath}" fn_script_log_warn "Configuration file missing!" fn_script_log_warn "${servercfgfullpath}" - sleep 2 + sleep 1 + install_config.sh fi fi From c0b3fc2a0221b48cc7ec9d402bb3bddc6e0d815d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 19:44:55 +0200 Subject: [PATCH 078/114] Clear more logs #1137 --- lgsm/functions/logs.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lgsm/functions/logs.sh b/lgsm/functions/logs.sh index 4bf9ab903..32ad0deae 100644 --- a/lgsm/functions/logs.sh +++ b/lgsm/functions/logs.sh @@ -29,6 +29,9 @@ fi # Log manager will start the cleanup if it finds logs older than "${logdays}" if [ $(find "${scriptlogdir}"/ -type f -mtime +"${logdays}"|wc -l) -ne "0" ]; then fn_print_dots "Starting" + # Set common logs directories + commonlogs="${systemdir}/logs" + commonsourcelogs="${systemdir}/*/logs" # Set addon logs directories sourcemodlogdir="${systemdir}/addons/sourcemod/logs" ulxlogdir="${systemdir}/data/ulx_logs" @@ -57,6 +60,17 @@ if [ $(find "${scriptlogdir}"/ -type f -mtime +"${logdays}"|wc -l) -ne "0" ]; th consolecount=$(find "${consolelogdir}"/ -type f -mtime +"${logdays}"|wc -l) find "${consolelogdir}"/ -mtime +"${logdays}" -type f -exec rm -f {} \; fi + # Common logfiles + if [ -d ${commonlogs} ]; then + find "${commonlogs}"/ -type f -mtime +"${logdays}"| tee >> "${scriptlog}" + smcount=$(find "${commonlogs}"/ -type f -mtime +"${logdays}"|wc -l) + find "${commonlogs}"/ -mtime +"${logdays}" -type f -exec rm -f {} \; + fi + if [ -d ${commonsourcelogs} ]; then + find "${commonsourcelogs}"/* -type f -mtime +"${logdays}"| tee >> "${scriptlog}" + smcount=$(find "${commonsourcelogs}"/* -type f -mtime +"${logdays}"|wc -l) + find "${commonsourcelogs}"/* -mtime +"${logdays}" -type f -exec rm -f {} \; + fi # Source addons logfiles if [ "${engine}" == "source" ]; then # SourceMod logfiles From bde812f8baa459525e5988fd7af0a157436c2f1e Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 20 Oct 2016 21:45:00 +0100 Subject: [PATCH 079/114] Renamed to Quake 3 --- Quake3/q3server | 4 ++-- lgsm/functions/command_install.sh | 2 +- lgsm/functions/install_server_files.sh | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Quake3/q3server b/Quake3/q3server index 4e722b08e..5e4b69c28 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -1,5 +1,5 @@ #!/bin/bash -# Quake 3: Team Arena +# Quake 3 # Server Management Script # Author: Daniel Gibbs # Website: https://gameservermanagers.com @@ -45,7 +45,7 @@ githubbranch="master" # Server Details servicename="quake3-server" -gamename="Quake 3: Team Arena" +gamename="Quake 3" engine="idtech3" # Directories diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index 23a20defd..99f8d696f 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -18,7 +18,7 @@ check_deps.sh if [ "${gamename}" == "Unreal Tournament 2004" ]; then install_server_files.sh install_ut2k4_key.sh -elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Quake 3: Team Arena" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then +elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Quake 3" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then installer=1 install_server_files.sh elif [ -n "${appid}" ]; then diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index d4bc66d12..1a23ef6e5 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -22,13 +22,9 @@ fn_install_server_files(){ elif [ "${gamename}" == "Unreal Tournament" ]; then fileurl="http://files.gameservermanagers.com/UnrealTournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${tmpdir}"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip"; executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6" elif [ "${gamename}" == "GoldenEye: Source" ]; then -<<<<<<< HEAD - fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_full_server_linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="254533d4643ad2fe6f1f3ecc4f6b5e5f" - elif [ "${gamename}" == "Quake 3: Team Arena" ]; then - fileurl="https://s3.amazonaws.com/linuxgsm/quake3-1.32b-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32b-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="8fe61809ade4f9cce24e520043afe91b" -======= fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_full_server_linux.tar.bz2"; filedir="${tmpdir}"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="ea227a150300abe346e757380325f84c" ->>>>>>> refs/remotes/origin/master + elif [ "${gamename}" == "Quake 3" ]; then + fileurl="http://files.gameservermanagers.com/Quake3/quake3-1.32b-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32b-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="8fe61809ade4f9cce24e520043afe91b" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From 64643b3dd6e0e3da70fa730c008acf1867b2876b Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 20 Oct 2016 22:02:49 +0100 Subject: [PATCH 080/114] Glibc version for Quake 3 --- lgsm/functions/info_glibc.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 655402584..b61fe21d8 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -41,6 +41,9 @@ elif [ "${gamename}" == "Mumble" ]; then elif [ "${gamename}" == "No More Room in Hell" ]; then glibcrequired="2.15" glibcfix="yes" +elif [ "${gamename}" == "Quake 3" ]; then + glibcrequired="2.1" + glibcfix="no" elif [ "${gamename}" == "Quake Live" ]; then glibcrequired="2.15" glibcfix="no" From d47037d78276065fc5836ff92236f84d57c96564 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 23:09:43 +0200 Subject: [PATCH 081/114] Putting all this into functions & prepare noprompt --- lgsm/functions/command_backup.sh | 193 +++++++++++++++++++++---------- 1 file changed, 133 insertions(+), 60 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 44cf937a3..01a6c3d03 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -11,56 +11,86 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh fn_print_header fn_script_log "Entering backup" + # Check if a backup is pending or has been aborted using .backup.lock -if [ -f "${tmpdir}/.backup.lock" ]; then - fn_print_warning_nl "A backup is currently running or has been aborted." - fn_script_log_warn "A backup is currently running or has been aborted" - while true; do - read -e -i "y" -p "Continue anyway? [Y/N]" yn - case $yn in - [Yy]* ) fn_script_log "User continues anyway"; break;; - [Nn]* ) echo Exiting; fn_script_log "User aborted"; return;; - * ) echo "Please answer yes or no.";; - esac - done -echo "" -fi -fn_print_dots "" -sleep 0.5 -# Prepare backup file name with servicename current date -backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" -# Tells how much will be compressed using rootdirduexbackup value from info_distro and prompt for continue -info_distro.sh -fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" -fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup: ${backupdir}/${backupname}.tar.gz" -echo "${backupdir}/${backupname}.tar.gz" -echo "" -while true; do - read -e -i "y" -p "Continue? [Y/n]" yn - case $yn in - [Yy]* ) fn_script_log "User validates"; break;; - [Nn]* ) echo "Exiting"; fn_script_log "User aborted"; return;; - * ) echo "Please answer yes or no.";; -esac -done +fn_check_pending_backup(){ + if [ -f "${tmpdir}/.backup.lock" ]; then + fn_print_warning_nl "A backup is currently running or has been aborted." + fn_script_log_warn "A backup is currently running or has been aborted" + if [ "${backupnoprompt}" == "1" ]; then + # Exit if is in noprompt mode + fn_print_error "Backup already in progress" + fn_script_log_fatal "Backup already in progress" + core_exit.sh + else + # Prompts user if in regular mode + while true; do + read -e -i "y" -p "Continue anyway? [Y/N]" yn + case $yn in + [Yy]* ) fn_script_log "User continues anyway"; break;; + [Nn]* ) echo Exiting; fn_script_log "User aborted"; return;; + * ) echo "Please answer yes or no.";; + esac + done + echo "" + fi + fi +} -# Check if server is started -check_status.sh -if [ "${status}" != "0" ]; then - echo "" - fn_print_warning_nl "${servicename} is currently running." - fn_script_log_warn "${servicename} is currently running" +# Initialization +fn_backup_init(){ + fn_print_dots "" sleep 0.5 - while true; do - read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn - case $yn in - [Yy]* ) exitbypass=1; fn_script_log "User choose to stop the server"; command_stop.sh; serverstopped="yes"; break;; - [Nn]* ) fn_script_log "User choose to not stop the server"; serverstopped="no"; break;; - * ) echo "Please answer yes or no.";; - esac - done -fi + # Prepare backup file name with servicename current date + backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" + # Tells how much will be compressed using rootdirduexbackup value from info_distro and prompt for continue + info_distro.sh + fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" + fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup: ${backupdir}/${backupname}.tar.gz" + echo "${backupdir}/${backupname}.tar.gz" + echo "" + # Prompt to start the backup if not in noprompt mode + if [ "${backupnoprompt}" != "1" ]; then + while true; do + read -e -i "y" -p "Continue? [Y/n]" yn + case $yn in + [Yy]* ) fn_script_log "User validates"; break;; + [Nn]* ) echo "Exiting"; fn_script_log "User aborted"; return;; + * ) echo "Please answer yes or no.";; + esac + done + echo "" + fi +} + + +# Check if server is started +fn_backup_stop_server(){ + check_status.sh + if [ "${status}" != "0" ]; then + echo "" + fn_print_warning_nl "${servicename} is currently running." + fn_script_log_warn "${servicename} is currently running" + sleep 0.5 + if [ "${backupnoprompt}" == "1" ]; then + # Don't stop the server in noprompt mode + serverstopped="no" + else + # Otherwise ask the user if it should be stopped or not + while true; do + read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn + case $yn in + [Yy]* ) exitbypass=1; fn_script_log "User choose to stop the server"; command_stop.sh; serverstopped="yes"; break;; + [Nn]* ) fn_script_log "User choose to not stop the server"; serverstopped="no"; break;; + * ) echo "Please answer yes or no.";; + esac + done + fi + fi +} +# Create required folders +fn_backup_directories(){ fn_print_dots "Backup in progress, please wait..." fn_script_log_info "Initiating backup" sleep 0.5 @@ -78,30 +108,60 @@ if [ -n "${tmpdir}" ]&&[ ! -d "${tmpdir}" ]; then fn_script_log "Creating ${tmpdir}" mkdir -p "${tmpdir}" fi +} + # Create lockfile +fn_backup_create_lockfile(){ if [ -d "${tmpdir}" ]; then touch "${tmpdir}/.backup.lock" fn_script_log "Lockfile created" fi +} # Compressing files +fn_backup_compression(){ fn_script_log "Compressing ${rootdirduexbackup}" tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* fn_script_log "Compression over" +} + +# Check tar exit code and set the result +fn_check_tar_exit(){ + if [ $? == 0 ]; then + backupresult="FAIL" + else + backupresult="PASS" + fi +} # Remove lockfile -if [ -d "${tmpdir}" ]; then +fn_backup_remove_lockfile(){ +if [ -d "${tmpdir}" ]&&[ -f "${tmpdir}/.backup.lock" ]; then rm "${tmpdir}/.backup.lock" fn_script_log "Lockfile removed" fi +} + +fn_backup_summary(){ + # when backupresult="PASS" + if [ "${backupresult}" == "PASS" ]; then + fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" + fn_script_log_pass "Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" + # When backupresult="FAIL" + elif [ "${backupresult}" == "PASS" ]; then + fn_print_error_nl "Backup failed: ${backupname}.tar.gz" + fn_script_log_error "Backup failed: ${backupname}.tar.gz" + core_exit.sh + else + fn_print_error_nl "Could not determine compression result." + fn_script_log_error "Could not determine compression result." + core_exit.sh + fi +} -# Check tar exit code and act accordingly -if [ $? == 0 ]; then - # Exit code doesn't report any error - fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" - fn_script_log_pass "Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" - - # Clear old backups if backupdays variable exists + +# Clear old backups according to maxbackups and maxbackupdays variables +fn_backup_clearing(){ if [ -n "${backupdays}" ]; then # Count how many backups can be cleared backupclearcount=$(find "${backupdir}"/ -type f -mtime +"${backupdays}"|wc -l) @@ -129,15 +189,28 @@ if [ $? == 0 ]; then else fn_script_log "No backups to clear since backupdays variable is empty" fi - # Restart the server if it was stopped for the backup +} + +# Restart the server if it was stopped for the backup +fn_backup_start_back(){ if [ "${serverstopped}" == "yes" ]; then exitbypass=1 command_start.sh fi -else - # Exit code reports an error - fn_print_error_nl "Backup failed: ${backupname}.tar.gz" - fn_script_log_error "Backup failed: ${backupname}.tar.gz" -fi +} + +# Run functions +fn_check_pending_backup +fn_backup_init +fn_backup_stop_server +fn_backup_directories +fn_backup_create_lockfile +fn_backup_compression +fn_check_tar_exit +fn_backup_remove_lockfile +fn_backup_summary +fn_backup_clearing +fn_backup_start_back + sleep 0.5 core_exit.sh From e9216cf0c4b3138d2883599a3002be24f9cea58c Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 23:12:28 +0200 Subject: [PATCH 082/114] noprompt again --- lgsm/functions/command_backup.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 01a6c3d03..8f3548ab8 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -169,15 +169,19 @@ fn_backup_clearing(){ if [ "${backupclearcount}" -ne "0" ]; then fn_print_info_nl "${backupclearcount} backups older than ${backupdays} days can be cleared." fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared" - while true; do - read -p -e"Clear older backups? [Y/N]" yn - case $yn in - [Yy]* ) clearoldbackups="yes"; break;; - [Nn]* ) clearoldbackups="no"; fn_script_log "Not clearing backups"; break;; - * ) echo "Please answer yes or no.";; - esac - done - # If user wants to clear backups + if [ "${backupnoprompt}" != "1" ]; then + while true; do + read -p -e"Clear older backups? [Y/N]" yn + case $yn in + [Yy]* ) clearoldbackups="yes"; break;; + [Nn]* ) clearoldbackups="no"; fn_script_log "Not clearing backups"; break;; + * ) echo "Please answer yes or no.";; + esac + done + else + clearoldbackups="yes" + fi + # If user wants to clear backups or if noprompt if [ "${clearoldbackups}" == "yes" ]; then find "${backupdir}"/ -mtime +"${backupdays}" -type f -exec rm -f {} \; fn_print_ok_nl "Cleared ${backupclearcount} backups." From 18b06485415e1010c61a33ae39296f7ae4d8ea55 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 23:19:04 +0200 Subject: [PATCH 083/114] PASS vs FAIL --- lgsm/functions/command_backup.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 8f3548ab8..2e3aefd9a 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -127,11 +127,11 @@ fn_script_log "Compression over" # Check tar exit code and set the result fn_check_tar_exit(){ - if [ $? == 0 ]; then - backupresult="FAIL" - else - backupresult="PASS" - fi +if [ $? == 0 ]; then + backupresult="PASS" +else + backupresult="FAIL" +fi } # Remove lockfile @@ -148,7 +148,7 @@ fn_backup_summary(){ fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" fn_script_log_pass "Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" # When backupresult="FAIL" - elif [ "${backupresult}" == "PASS" ]; then + elif [ "${backupresult}" == "FAIL" ]; then fn_print_error_nl "Backup failed: ${backupname}.tar.gz" fn_script_log_error "Backup failed: ${backupname}.tar.gz" core_exit.sh From a4dcf379ee0e3764d072dce1eff1fdf8f50b3d38 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 20 Oct 2016 22:23:07 +0100 Subject: [PATCH 084/114] Renamed to Quake 3: Arena --- Quake3/q3server | 4 ++-- lgsm/functions/command_install.sh | 2 +- lgsm/functions/info_glibc.sh | 2 +- lgsm/functions/install_server_files.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Quake3/q3server b/Quake3/q3server index 5e4b69c28..8aff1501e 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -1,5 +1,5 @@ #!/bin/bash -# Quake 3 +# Quake 3: Arena # Server Management Script # Author: Daniel Gibbs # Website: https://gameservermanagers.com @@ -45,7 +45,7 @@ githubbranch="master" # Server Details servicename="quake3-server" -gamename="Quake 3" +gamename="Quake 3: Arena" engine="idtech3" # Directories diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index 99f8d696f..2a2037daf 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -18,7 +18,7 @@ check_deps.sh if [ "${gamename}" == "Unreal Tournament 2004" ]; then install_server_files.sh install_ut2k4_key.sh -elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Quake 3" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then +elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Quake 3: Arena" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament 3" ]||[ "${gamename}" == "Unreal Tournament" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then installer=1 install_server_files.sh elif [ -n "${appid}" ]; then diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index b61fe21d8..c1d7cb1cf 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -41,7 +41,7 @@ elif [ "${gamename}" == "Mumble" ]; then elif [ "${gamename}" == "No More Room in Hell" ]; then glibcrequired="2.15" glibcfix="yes" -elif [ "${gamename}" == "Quake 3" ]; then +elif [ "${gamename}" == "Quake 3: Arena" ]; then glibcrequired="2.1" glibcfix="no" elif [ "${gamename}" == "Quake Live" ]; then diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 1a23ef6e5..e14a0521a 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -23,7 +23,7 @@ fn_install_server_files(){ fileurl="http://files.gameservermanagers.com/UnrealTournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${tmpdir}"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip"; executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6" elif [ "${gamename}" == "GoldenEye: Source" ]; then fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_full_server_linux.tar.bz2"; filedir="${tmpdir}"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="ea227a150300abe346e757380325f84c" - elif [ "${gamename}" == "Quake 3" ]; then + elif [ "${gamename}" == "Quake 3: Arena" ]; then fileurl="http://files.gameservermanagers.com/Quake3/quake3-1.32b-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32b-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="8fe61809ade4f9cce24e520043afe91b" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" From ba8d4a1c9eb222e4d7551fe716e7246305feb763 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 20 Oct 2016 22:23:22 +0100 Subject: [PATCH 085/114] added Quake 3 Arena Config --- 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 13db1215b..e61496414 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -291,6 +291,12 @@ elif [ "${gamename}" == "Project Zomboid" ]; then fn_fetch_default_config fn_default_config_remote fn_set_config_vars +elif [ "${gamename}" == "Quake 3: Arena" ]; then + gamedirname="QuakeLive" + array_configs+=( server.cfg ) + fn_fetch_default_config + fn_default_config_remote + fn_set_config_vars elif [ "${gamename}" == "Quake Live" ]; then gamedirname="QuakeLive" array_configs+=( server.cfg ) From 6bee0b423cbbbb52283c51878a2808740590044f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 20 Oct 2016 22:24:30 +0100 Subject: [PATCH 086/114] Added quake 3 arena details --- lgsm/functions/command_details.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index 9cf79be84..fe37083df 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -386,6 +386,15 @@ fn_details_refractor(){ } | column -s $'\t' -t } +fn_details_quake3(){ + echo -e "netstat -atunp | grep q3ded" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + } | column -s $'\t' -t +} + fn_details_quakelive(){ echo -e "netstat -atunp | grep qzeroded" echo -e "" @@ -665,6 +674,8 @@ fn_display_details() { fn_details_ark elif [ "${gamename}" == "Hurtworld" ]; then fn_details_hurtworld + elif [ "${gamename}" == "Quake 3: Arena" ]; then + fn_details_quake3 elif [ "${gamename}" == "Quake Live" ]; then fn_details_quakelive elif [ "${gamename}" == "TeamSpeak 3" ]; then From 53862daa9c1ac04c86ab0a1834405d00c890b095 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Thu, 20 Oct 2016 23:27:08 +0200 Subject: [PATCH 087/114] fix prompt & contrib --- lgsm/functions/command_backup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 2e3aefd9a..71c54efd1 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -1,6 +1,7 @@ #!/bin/bash # LGSM command_backup.sh function # Author: Daniel Gibbs +# Contributor: UltimateByte # Website: https://gameservermanagers.com # Description: Creates a .tar.gz file in the backup directory. @@ -171,7 +172,7 @@ fn_backup_clearing(){ fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared" if [ "${backupnoprompt}" != "1" ]; then while true; do - read -p -e"Clear older backups? [Y/N]" yn + read -e -p "Clear older backups? [Y/N]" yn case $yn in [Yy]* ) clearoldbackups="yes"; break;; [Nn]* ) clearoldbackups="no"; fn_script_log "Not clearing backups"; break;; From 61d846b985d055e6de421d3cfa3c12eab15c3031 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 20 Oct 2016 23:07:02 +0100 Subject: [PATCH 088/114] Updated config info --- Quake3/q3server | 3 ++- lgsm/functions/install_config.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Quake3/q3server b/Quake3/q3server index 8aff1501e..6c2e4d844 100644 --- a/Quake3/q3server +++ b/Quake3/q3server @@ -55,14 +55,15 @@ lockselfname=".${servicename}.lock" lgsmdir="${rootdir}/lgsm" functionsdir="${lgsmdir}/functions" libdir="${lgsmdir}/lib" +tmpdir="${lgsmdir}/tmp" filesdir="${rootdir}/serverfiles" systemdir="${filesdir}/baseq3" executabledir="${filesdir}" executable="./q3ded" servercfg="${servicename}.cfg" +servercfgdefault="server.cfg" servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" -servercfgdefault="${servercfgdir}/lgsm-default.cfg" backupdir="${rootdir}/backups" # Logging diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index e61496414..d3828a5eb 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -292,7 +292,7 @@ elif [ "${gamename}" == "Project Zomboid" ]; then fn_default_config_remote fn_set_config_vars elif [ "${gamename}" == "Quake 3: Arena" ]; then - gamedirname="QuakeLive" + gamedirname="Quake3Arena" array_configs+=( server.cfg ) fn_fetch_default_config fn_default_config_remote From 5a5ca5769cc1058cb07be25dbad7b4b18d4aa2b6 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 00:35:06 +0200 Subject: [PATCH 089/114] noprompt & shutdownonbackup #1098 variable renaming as well, maxbackupdays --- lgsm/functions/command_backup.sh | 101 +++++++++---------------------- 1 file changed, 30 insertions(+), 71 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 71c54efd1..e4a0a7949 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -18,24 +18,10 @@ fn_check_pending_backup(){ if [ -f "${tmpdir}/.backup.lock" ]; then fn_print_warning_nl "A backup is currently running or has been aborted." fn_script_log_warn "A backup is currently running or has been aborted" - if [ "${backupnoprompt}" == "1" ]; then # Exit if is in noprompt mode - fn_print_error "Backup already in progress" + fn_print_error "Backup already in progress." fn_script_log_fatal "Backup already in progress" core_exit.sh - else - # Prompts user if in regular mode - while true; do - read -e -i "y" -p "Continue anyway? [Y/N]" yn - case $yn in - [Yy]* ) fn_script_log "User continues anyway"; break;; - [Nn]* ) echo Exiting; fn_script_log "User aborted"; return;; - * ) echo "Please answer yes or no.";; - esac - done - echo "" - fi - fi } # Initialization @@ -50,43 +36,31 @@ fn_backup_init(){ fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup: ${backupdir}/${backupname}.tar.gz" echo "${backupdir}/${backupname}.tar.gz" echo "" - # Prompt to start the backup if not in noprompt mode - if [ "${backupnoprompt}" != "1" ]; then - while true; do - read -e -i "y" -p "Continue? [Y/n]" yn - case $yn in - [Yy]* ) fn_script_log "User validates"; break;; - [Nn]* ) echo "Exiting"; fn_script_log "User aborted"; return;; - * ) echo "Please answer yes or no.";; - esac - done - echo "" - fi } -# Check if server is started +# Check if server is started and wether to shut it down fn_backup_stop_server(){ check_status.sh - if [ "${status}" != "0" ]; then - echo "" - fn_print_warning_nl "${servicename} is currently running." - fn_script_log_warn "${servicename} is currently running" - sleep 0.5 - if [ "${backupnoprompt}" == "1" ]; then - # Don't stop the server in noprompt mode - serverstopped="no" - else - # Otherwise ask the user if it should be stopped or not - while true; do - read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn - case $yn in - [Yy]* ) exitbypass=1; fn_script_log "User choose to stop the server"; command_stop.sh; serverstopped="yes"; break;; - [Nn]* ) fn_script_log "User choose to not stop the server"; serverstopped="no"; break;; - * ) echo "Please answer yes or no.";; - esac - done - fi + echo "" + # Server is shut down + if [ "${status}" == "0" ]; then + serverstopped="no" + # Server is up and shutdownonbackup is off + elif [ "${shutdownonbackup}" == "off" ]; then + serverstopped="no" + fn_print_warning_nl "${servicename} is started and will not be stopped." + fn_print_info_nl "It is advised to shutdown the server to prevent a file change during compression resulting in a tar error." + fn_script_log_warn "${servicename} is started during the backup" + fn_script_log_info "It is advised to shutdown the server to prevent a file change during compression resulting in a tar error." + # Server is up and will be stopped if shutdownonbackup has no value or anything else than "off" + else + fn_print_warning_nl "${servicename} will be stopped during the backup." + fn_script_log_warn "${servicename} will be stopped during the backup" + sleep 4 + serverstopped="yes" + exitbypass=1 + command_stop.sh fi } @@ -163,36 +137,21 @@ fn_backup_summary(){ # Clear old backups according to maxbackups and maxbackupdays variables fn_backup_clearing(){ - if [ -n "${backupdays}" ]; then + if [ -n "${maxbackupdays}" ]; then # Count how many backups can be cleared - backupclearcount=$(find "${backupdir}"/ -type f -mtime +"${backupdays}"|wc -l) + backupclearcount=$(find "${backupdir}"/ -type f -mtime +"${maxbackupdays}"|wc -l) # Check if there is any backup to clear if [ "${backupclearcount}" -ne "0" ]; then - fn_print_info_nl "${backupclearcount} backups older than ${backupdays} days can be cleared." - fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared" - if [ "${backupnoprompt}" != "1" ]; then - while true; do - read -e -p "Clear older backups? [Y/N]" yn - case $yn in - [Yy]* ) clearoldbackups="yes"; break;; - [Nn]* ) clearoldbackups="no"; fn_script_log "Not clearing backups"; break;; - * ) echo "Please answer yes or no.";; - esac - done - else - clearoldbackups="yes" - fi - # If user wants to clear backups or if noprompt - if [ "${clearoldbackups}" == "yes" ]; then - find "${backupdir}"/ -mtime +"${backupdays}" -type f -exec rm -f {} \; - fn_print_ok_nl "Cleared ${backupclearcount} backups." - fn_script_log_pass "Cleared ${backupclearcount} backups" - fi + fn_print_info_nl "${backupclearcount} backups older than ${maxbackupdays} days can be cleared." + fn_script_log "${backupclearcount} backups older than ${maxbackupdays} days can be cleared" + find "${backupdir}"/ -mtime +"${maxbackupdays}" -type f -exec rm -f {} \; + fn_print_ok_nl "Cleared ${backupclearcount} backups." + fn_script_log_pass "Cleared ${backupclearcount} backups" else - fn_script_log "No backups older than ${backupdays} days were found" + fn_script_log "No backups older than ${maxbackupdays} days were found" fi else - fn_script_log "No backups to clear since backupdays variable is empty" + fn_script_log "No backups to clear since maxbackupdays variable is empty" fi } From 026ddcdd52519cbea6dc2573c1916b1bc16657d2 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 00:42:17 +0200 Subject: [PATCH 090/114] fix syntax & messages #1098 --- lgsm/functions/command_backup.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index e4a0a7949..0dae1117d 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -16,12 +16,13 @@ fn_script_log "Entering backup" # Check if a backup is pending or has been aborted using .backup.lock fn_check_pending_backup(){ if [ -f "${tmpdir}/.backup.lock" ]; then - fn_print_warning_nl "A backup is currently running or has been aborted." - fn_script_log_warn "A backup is currently running or has been aborted" - # Exit if is in noprompt mode - fn_print_error "Backup already in progress." - fn_script_log_fatal "Backup already in progress" - core_exit.sh + fn_print_error "A backup is currently running or has been aborted." + fn_print_info_nl "If you keep seing this message, remove the following file:" + echo "${tmpdir}/.backup.lock" + fn_script_log_fatal "A backup is currently running or has been aborted." + fin_script_log_info "If you keep seing this message, remove the following file: ${tmpdir}/.backup.lock" + core_exit.sh + fi } # Initialization From 8d1167c596f5f49354443f979b1346d5998dd3ec Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 00:49:36 +0200 Subject: [PATCH 091/114] messages and echos --- lgsm/functions/command_backup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 0dae1117d..5669b66e4 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -36,14 +36,12 @@ fn_backup_init(){ fn_print_info_nl "A total of ${rootdirduexbackup} will be compressed into the following backup:" fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup: ${backupdir}/${backupname}.tar.gz" echo "${backupdir}/${backupname}.tar.gz" - echo "" } # Check if server is started and wether to shut it down fn_backup_stop_server(){ check_status.sh - echo "" # Server is shut down if [ "${status}" == "0" ]; then serverstopped="no" @@ -149,6 +147,7 @@ fn_backup_clearing(){ fn_print_ok_nl "Cleared ${backupclearcount} backups." fn_script_log_pass "Cleared ${backupclearcount} backups" else + fn_print_info_nl "No backups older than ${maxbackupdays} days were found." fn_script_log "No backups older than ${maxbackupdays} days were found" fi else From 14188268f7627ffcc092c10a15802168b7f85a0b Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 01:04:23 +0200 Subject: [PATCH 092/114] messages that make more sense #1098 --- lgsm/functions/command_backup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 5669b66e4..3182f5ea5 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -48,10 +48,10 @@ fn_backup_stop_server(){ # Server is up and shutdownonbackup is off elif [ "${shutdownonbackup}" == "off" ]; then serverstopped="no" - fn_print_warning_nl "${servicename} is started and will not be stopped." - fn_print_info_nl "It is advised to shutdown the server to prevent a file change during compression resulting in a tar error." - fn_script_log_warn "${servicename} is started during the backup" - fn_script_log_info "It is advised to shutdown the server to prevent a file change during compression resulting in a tar error." + fn_print_info_nl "${servicename} is started and will not be stopped." + fn_print_information_nl "It is advised to stop the server to prevent a file changes and tar errors." + fn_script_log_info "${servicename} is started during the backup" + fn_script_log_info "It is advised to stop the server to prevent a file changes and tar errors." # Server is up and will be stopped if shutdownonbackup has no value or anything else than "off" else fn_print_warning_nl "${servicename} will be stopped during the backup." From 430fbe9d7d8275aa911a7d970e6c1c18c615945b Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 03:40:09 +0200 Subject: [PATCH 093/114] preparing maxbackups some work in fn_backup_clearing is needed for this to work properly --- lgsm/functions/command_backup.sh | 43 +++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 3182f5ea5..5abb78ed8 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -10,7 +10,6 @@ local commandaction="Backup" local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh -fn_print_header fn_script_log "Entering backup" # Check if a backup is pending or has been aborted using .backup.lock @@ -136,23 +135,39 @@ fn_backup_summary(){ # Clear old backups according to maxbackups and maxbackupdays variables fn_backup_clearing(){ - if [ -n "${maxbackupdays}" ]; then - # Count how many backups can be cleared - backupclearcount=$(find "${backupdir}"/ -type f -mtime +"${maxbackupdays}"|wc -l) - # Check if there is any backup to clear - if [ "${backupclearcount}" -ne "0" ]; then - fn_print_info_nl "${backupclearcount} backups older than ${maxbackupdays} days can be cleared." - fn_script_log "${backupclearcount} backups older than ${maxbackupdays} days can be cleared" +# How many backups there are +backupscount=$(find "${backupdir}/" -type f -name "*.tar.gz"|wc -l) +# How many backups exceed maxbackups +backupquotadiff=$((backupscount-maxbackups)) +#backupquotadiff=$(find ${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail -n +"${maxbackups}" | cut -f2- -d" " | wc -l) +backupsoudatedcount=$(find "${backupdir}"/ -type f -name "*.tar.gz" -mtime +"${maxbackupdays}"|wc -l) +# If backup variables are set +if [ -n "${maxbackupdays}" ]&&{ -n "${maxbackups}" ]; then + # If anything can be cleared + if [ "${backupquotadiff}" -gt "0" ]||[ "${backupsoudatedcount}" -gt "0" ]; then + # If maxbackups is used over maxbackupdays + if [ "${backupquotadiff}" -gt "${backupsoudatedcount}" ]||[ "${backupquotadiff}" -eq "${backupsoudatedcount}" ]; then + # Display how many backups will be cleared + echo "${backupquotadiff} backups will be clearned" + fn_print_info_nl "${backupquotadiff} backups than max ${maxbackups} will be cleared." + fn_script_log "${backupquotadiff} backups than max ${maxbackups} will be cleared" + echo "... Once this update is over" + # Clear over quota backups + #find "${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail "${backupquotadiff}" | cut -f2- -d" " + # If maxbackupdays is used over maxbackups + elif [ "${backupquotadiff}" -gt "${backupsoudatedcount}" ]; then + # Display how many backups will be cleared + fn_print_info_nl "${backupsoudatedcount} backups older than ${maxbackupdays} days will be cleared." + fn_script_log "${backupsoudatedcount} backups older than ${maxbackupdays} days will be cleared" find "${backupdir}"/ -mtime +"${maxbackupdays}" -type f -exec rm -f {} \; - fn_print_ok_nl "Cleared ${backupclearcount} backups." - fn_script_log_pass "Cleared ${backupclearcount} backups" + fn_print_ok_nl "Cleared ${backupsoudatedcount} backups." + fn_script_log_pass "Cleared ${backupsoudatedcount} backups" else - fn_print_info_nl "No backups older than ${maxbackupdays} days were found." fn_script_log "No backups older than ${maxbackupdays} days were found" - fi - else - fn_script_log "No backups to clear since maxbackupdays variable is empty" fi +else + fn_script_log "No backups to clear since maxbackupdays variable is empty" +fi } # Restart the server if it was stopped for the backup From f54f546830e257c4cb209902d0a036cf96a40081 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 03:45:40 +0200 Subject: [PATCH 094/114] typos --- lgsm/functions/command_backup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 5abb78ed8..d45f11434 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -142,7 +142,7 @@ backupquotadiff=$((backupscount-maxbackups)) #backupquotadiff=$(find ${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail -n +"${maxbackups}" | cut -f2- -d" " | wc -l) backupsoudatedcount=$(find "${backupdir}"/ -type f -name "*.tar.gz" -mtime +"${maxbackupdays}"|wc -l) # If backup variables are set -if [ -n "${maxbackupdays}" ]&&{ -n "${maxbackups}" ]; then +if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then # If anything can be cleared if [ "${backupquotadiff}" -gt "0" ]||[ "${backupsoudatedcount}" -gt "0" ]; then # If maxbackups is used over maxbackupdays @@ -164,6 +164,7 @@ if [ -n "${maxbackupdays}" ]&&{ -n "${maxbackups}" ]; then fn_script_log_pass "Cleared ${backupsoudatedcount} backups" else fn_script_log "No backups older than ${maxbackupdays} days were found" + fi fi else fn_script_log "No backups to clear since maxbackupdays variable is empty" From fc3abd0db56b37112d2fb2511795e354dad8d202 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 03:48:34 +0200 Subject: [PATCH 095/114] stoponbackup --- lgsm/functions/command_backup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index d45f11434..623191bf6 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -38,20 +38,20 @@ fn_backup_init(){ } -# Check if server is started and wether to shut it down +# Check if server is started and wether to stop it fn_backup_stop_server(){ check_status.sh - # Server is shut down + # Server is stopped if [ "${status}" == "0" ]; then serverstopped="no" - # Server is up and shutdownonbackup is off - elif [ "${shutdownonbackup}" == "off" ]; then + # Server is up and stoponbackup is off + elif [ "${stoponbackup}" == "off" ]; then serverstopped="no" fn_print_info_nl "${servicename} is started and will not be stopped." fn_print_information_nl "It is advised to stop the server to prevent a file changes and tar errors." fn_script_log_info "${servicename} is started during the backup" fn_script_log_info "It is advised to stop the server to prevent a file changes and tar errors." - # Server is up and will be stopped if shutdownonbackup has no value or anything else than "off" + # Server is up and will be stopped if stoponbackup has no value or anything else than "off" else fn_print_warning_nl "${servicename} will be stopped during the backup." fn_script_log_warn "${servicename} will be stopped during the backup" From 0eee074edb4c33ec1da0a3b61d6d5227d9cc3647 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 03:51:30 +0200 Subject: [PATCH 096/114] less than --- lgsm/functions/command_backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 623191bf6..83f9204aa 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -155,7 +155,7 @@ if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then # Clear over quota backups #find "${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail "${backupquotadiff}" | cut -f2- -d" " # If maxbackupdays is used over maxbackups - elif [ "${backupquotadiff}" -gt "${backupsoudatedcount}" ]; then + elif [ "${backupquotadiff}" -lt "${backupsoudatedcount}" ]; then # Display how many backups will be cleared fn_print_info_nl "${backupsoudatedcount} backups older than ${maxbackupdays} days will be cleared." fn_script_log "${backupsoudatedcount} backups older than ${maxbackupdays} days will be cleared" From 0d986a99cd56254222d43ae1712fa5cdd0c59894 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 04:03:14 +0200 Subject: [PATCH 097/114] should work, to be tested --- lgsm/functions/command_backup.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 83f9204aa..b198278b3 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -139,21 +139,20 @@ fn_backup_clearing(){ backupscount=$(find "${backupdir}/" -type f -name "*.tar.gz"|wc -l) # How many backups exceed maxbackups backupquotadiff=$((backupscount-maxbackups)) -#backupquotadiff=$(find ${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail -n +"${maxbackups}" | cut -f2- -d" " | wc -l) backupsoudatedcount=$(find "${backupdir}"/ -type f -name "*.tar.gz" -mtime +"${maxbackupdays}"|wc -l) # If backup variables are set if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then # If anything can be cleared if [ "${backupquotadiff}" -gt "0" ]||[ "${backupsoudatedcount}" -gt "0" ]; then - # If maxbackups is used over maxbackupdays + # If maxbackups greater or equal than backupsoutdatedcount, then it is used over maxbackupdays if [ "${backupquotadiff}" -gt "${backupsoudatedcount}" ]||[ "${backupquotadiff}" -eq "${backupsoudatedcount}" ]; then # Display how many backups will be cleared echo "${backupquotadiff} backups will be clearned" - fn_print_info_nl "${backupquotadiff} backups than max ${maxbackups} will be cleared." - fn_script_log "${backupquotadiff} backups than max ${maxbackups} will be cleared" - echo "... Once this update is over" + fn_print_info_nl "${backupquotadiff} backups exceed max ${maxbackups} and will be cleared." + fn_script_log "${backupquotadiff} backups exceed max ${maxbackups} and will be cleared" + sleep 2 # Clear over quota backups - #find "${backupdir}"/ -type f -printf '%T@ %p\n' | sort -rn | tail "${backupquotadiff}" | cut -f2- -d" " + find "${backupdir}"/ -type f -name "*.tar.gz" -printf '%T@ %p\n' | sort -rn | tail -${backupquotadiff} | cut -f2- -d" " | xargs rm # If maxbackupdays is used over maxbackups elif [ "${backupquotadiff}" -lt "${backupsoudatedcount}" ]; then # Display how many backups will be cleared From f4026704bb96e18abc23ad2641cbd6eb4e4baca3 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 04:08:04 +0200 Subject: [PATCH 098/114] output and logging --- lgsm/functions/command_backup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index b198278b3..2862859f4 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -153,6 +153,8 @@ if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then sleep 2 # Clear over quota backups find "${backupdir}"/ -type f -name "*.tar.gz" -printf '%T@ %p\n' | sort -rn | tail -${backupquotadiff} | cut -f2- -d" " | xargs rm + fn_print_ok_nl "Cleared ${backupquotadiff} backups." + fn_script_log "Cleared ${backupquotadiff} backups" # If maxbackupdays is used over maxbackups elif [ "${backupquotadiff}" -lt "${backupsoudatedcount}" ]; then # Display how many backups will be cleared From b68ebd8d1c910057d4e0028a04d88b0e6e7d49b3 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 12:58:45 +0200 Subject: [PATCH 099/114] messages --- lgsm/functions/command_backup.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 2862859f4..199226ba9 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -147,28 +147,27 @@ if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then # If maxbackups greater or equal than backupsoutdatedcount, then it is used over maxbackupdays if [ "${backupquotadiff}" -gt "${backupsoudatedcount}" ]||[ "${backupquotadiff}" -eq "${backupsoudatedcount}" ]; then # Display how many backups will be cleared - echo "${backupquotadiff} backups will be clearned" - fn_print_info_nl "${backupquotadiff} backups exceed max ${maxbackups} and will be cleared." - fn_script_log "${backupquotadiff} backups exceed max ${maxbackups} and will be cleared" + fn_print_info_nl "${backupquotadiff} backup(s) exceed max ${maxbackups} and will be cleared." + fn_script_log "${backupquotadiff} backup(s) exceed max ${maxbackups} and will be cleared" sleep 2 # Clear over quota backups find "${backupdir}"/ -type f -name "*.tar.gz" -printf '%T@ %p\n' | sort -rn | tail -${backupquotadiff} | cut -f2- -d" " | xargs rm - fn_print_ok_nl "Cleared ${backupquotadiff} backups." - fn_script_log "Cleared ${backupquotadiff} backups" + fn_print_ok_nl "Cleared ${backupquotadiff} backup(s)." + fn_script_log "Cleared ${backupquotadiff} backup(s)" # If maxbackupdays is used over maxbackups elif [ "${backupquotadiff}" -lt "${backupsoudatedcount}" ]; then # Display how many backups will be cleared - fn_print_info_nl "${backupsoudatedcount} backups older than ${maxbackupdays} days will be cleared." - fn_script_log "${backupsoudatedcount} backups older than ${maxbackupdays} days will be cleared" + fn_print_info_nl "${backupsoudatedcount} backup(s) older than ${maxbackupdays} days will be cleared." + fn_script_log "${backupsoudatedcount} backup(s) older than ${maxbackupdays} days will be cleared" find "${backupdir}"/ -mtime +"${maxbackupdays}" -type f -exec rm -f {} \; - fn_print_ok_nl "Cleared ${backupsoudatedcount} backups." - fn_script_log_pass "Cleared ${backupsoudatedcount} backups" + fn_print_ok_nl "Cleared ${backupsoudatedcount} backup(s)." + fn_script_log_pass "Cleared ${backupsoudatedcount} backup(s)" else fn_script_log "No backups older than ${maxbackupdays} days were found" fi fi else - fn_script_log "No backups to clear since maxbackupdays variable is empty" + fn_script_log "No backups to clear since maxbackupdays and maxbackups variables are not set" fi } From 7c157a8edc1235a7049488bb2a2a68993949e01d Mon Sep 17 00:00:00 2001 From: Alexander Hurd Date: Fri, 21 Oct 2016 07:31:29 -0400 Subject: [PATCH 100/114] updating to quake3-1.32c --- 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 e14a0521a..0bcdcc90c 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -24,7 +24,7 @@ fn_install_server_files(){ elif [ "${gamename}" == "GoldenEye: Source" ]; then fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_full_server_linux.tar.bz2"; filedir="${tmpdir}"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="ea227a150300abe346e757380325f84c" elif [ "${gamename}" == "Quake 3: Arena" ]; then - fileurl="http://files.gameservermanagers.com/Quake3/quake3-1.32b-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32b-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="8fe61809ade4f9cce24e520043afe91b" + fileurl="https://s3.amazonaws.com/linuxgsm/quake3-1.32c-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32c-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="fd7258d827474f67663dda297bff4306" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From 31ff13993c12629d3a09b8676e49cda16dd81ebc Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Thu, 20 Oct 2016 23:43:10 +0100 Subject: [PATCH 101/114] Added Quake 3 --- lgsm/functions/info_config.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index d5f283404..846dec349 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -154,6 +154,26 @@ fn_info_config_projectzomboid(){ fi } +fn_info_config_quake3(){ + if [ ! -f "${servercfgfullpath}" ]; then + rconpassword="${unavailable}" + servername="${unavailable}" + serverpassword="${unavailable}" + slots="${zero}" + else + rconpassword=$(grep "zmq_rcon_password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set zmq_rcon_password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + servername=$(grep "sv_hostname" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set sv_hostname//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + serverpassword=$(grep "rconpassword" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set rconpassword//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + slots=$(grep "sv_maxclients" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') + + # Not Set + rconpassword=${rconpassword:-"NOT SET"} + servername=${servername:-"NOT SET"} + serverpassword=${serverpassword:-"NOT SET"} + slots=${slots:-"0"} + fi +} + fn_info_config_quakelive(){ if [ ! -f "${servercfgfullpath}" ]; then rconpassword="${unavailable}" @@ -475,6 +495,9 @@ elif [ "${gamename}" == "Battlefield: 1942" ]; then # Dont Starve Together elif [ "${engine}" == "dontstarve" ]; then fn_info_config_dontstarve +# Quake 3 +elif [ "${gamename}" == "Quake 3: Arena" ]; then + fn_info_config_quake3 # Quake Live elif [ "${gamename}" == "Quake Live" ]; then fn_info_config_quakelive From ea0c6973fb17863888de4440b70bbc53418f1c21 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 21 Oct 2016 14:44:11 +0100 Subject: [PATCH 102/114] Updated Quake 3 location --- 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 0bcdcc90c..d9f6cad5c 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -24,7 +24,7 @@ fn_install_server_files(){ elif [ "${gamename}" == "GoldenEye: Source" ]; then fileurl="http://files.gameservermanagers.com/GoldenEyeSource/GoldenEye_Source_v5.0.1_full_server_linux.tar.bz2"; filedir="${tmpdir}"; filename="GoldenEye_Source_v5.0.1_server_full_Linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="ea227a150300abe346e757380325f84c" elif [ "${gamename}" == "Quake 3: Arena" ]; then - fileurl="https://s3.amazonaws.com/linuxgsm/quake3-1.32c-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32c-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="fd7258d827474f67663dda297bff4306" + fileurl="http://files.gameservermanagers.com/Quake3/quake3-1.32c-x86-full-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="quake3-1.32c-x86-full-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="fd7258d827474f67663dda297bff4306" fi fn_fetch_file "${fileurl}" "${filedir}" "${filename}" "${executecmd}" "${run}" "${force}" "${md5}" fn_dl_extract "${filedir}" "${filename}" "${filesdir}" From b3f8b29a06f57ba70a752adffabaf40d84484e3f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 21 Oct 2016 15:11:38 +0100 Subject: [PATCH 103/114] Added Quake 3 to correct getopt --- 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 217650dbc..da5a0d710 100644 --- a/lgsm/functions/core_getopt.sh +++ b/lgsm/functions/core_getopt.sh @@ -622,7 +622,7 @@ case "${getopt}" in if [ "${gamename}" == "Mumble" ]; then fn_getopt_mumble -elif [ "${gamename}" == "Battlefield: 1942" ]|| [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then +elif [ "${gamename}" == "Battlefield: 1942" ]||[ "${gamename}" == "Quake 3: Arena" ]||[ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then fn_getopt_generic_no_update elif [ "${engine}" == "lwjgl2" ]; then fn_getopt_minecraft From c3f671f23709396cf07908b940ad5f49d9d6ccd8 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 21 Oct 2016 15:30:26 +0100 Subject: [PATCH 104/114] Updated version numbers --- ARKSurvivalEvolved/arkserver | 2 +- Arma3/arma3server | 2 +- Battlefield1942/bf1942server | 2 +- BlackMesa/bmdmserver | 2 +- BladeSymphony/bsserver | 2 +- BrainBread2/bb2server | 2 +- CodenameCURE/ccserver | 2 +- CounterStrike/csserver | 2 +- CounterStrikeConditionZero/csczserver | 2 +- CounterStrikeGlobalOffensive/csgoserver | 2 +- CounterStrikeSource/cssserver | 2 +- DayOfDefeat/dodserver | 2 +- DayOfDefeatSource/dodsserver | 2 +- DayOfInfamy/doiserver | 2 +- DeathmatchClassic/dmcserver | 2 +- DontStarveTogether/dstserver | 2 +- DoubleActionBoogaloo/dabserver | 2 +- EmpiresMod/emserver | 2 +- FistfulOfFrags/fofserver | 2 +- GarrysMod/gmodserver | 2 +- GoldenEyeSource/gesserver | 2 +- HalfLife2Deathmatch/hl2dmserver | 2 +- HalfLifeDeathmatch/hldmserver | 2 +- HalfLifeDeathmatchSource/hldmsserver | 2 +- Hurtworld/hwserver | 2 +- Insurgency/insserver | 2 +- JustCause2/jc2server | 2 +- KillingFloor/kfserver | 2 +- Left4Dead/l4dserver | 2 +- Left4Dead2/l4d2server | 2 +- Minecraft/mcserver | 68 ++++++++++++------------- Mumble/mumbleserver | 2 +- NS2Combat/ns2cserver | 2 +- NaturalSelection2/ns2server | 2 +- NoMoreRoomInHell/nmrihserver | 2 +- OpposingForce/opforserver | 2 +- PiratesVikingandKnightsII/pvkiiserver | 2 +- ProjectZomboid/pzserver | 2 +- QuakeLive/qlserver | 2 +- RedOrchestra/roserver | 2 +- Ricochet/ricochetserver | 2 +- Rust/rustserver | 2 +- SeriousSam3BFE/ss3sserver | 2 +- Starbound/sbserver | 2 +- SvenCoop/svenserver | 2 +- TeamFortress2/tf2server | 2 +- TeamFortressClassic/tfcserver | 2 +- TeamSpeak3/ts3server | 2 +- Teeworlds/twserver | 2 +- Terraria/terrariaserver | 2 +- UnrealTournament/utserver | 2 +- UnrealTournament2004/ut2k4server | 2 +- UnrealTournament3/ut3server | 2 +- UnrealTournament99/ut99server | 2 +- WolfensteinEnemyTerritory/wetserver | 2 +- lgsm/functions/fn_functions | 2 +- lgsm/functions/fn_getopt | 2 +- lgsm/functions/fn_update_functions | 2 +- 58 files changed, 91 insertions(+), 91 deletions(-) diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index efba11b51..bcabf3e27 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/Arma3/arma3server b/Arma3/arma3server index 62a760104..82484e3e4 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index 14995f4cf..5aca78b93 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 91fe6bb56..5026662a4 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index e5e071271..946e6c2d9 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 8ff2d159c..8348aafd2 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index 3473eed80..3f08a563f 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/CounterStrike/csserver b/CounterStrike/csserver index e2cdde7fc..ae04a04d6 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="060816" +version="211016" #### Variables #### diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 895ec1583..fb6971bbc 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 87425d00a..b5e93a15e 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index e6994789e..8faed4600 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index f6cd2b34e..092374517 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 342ccc97a..f147c480d 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index 7440b369f..c5baebe29 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index b987c9685..8c90086d0 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index e96d304b8..2b6805c38 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index 4b8b531e9..ad9232079 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index 20e28b2d4..4251c1093 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 8a9fa69c5..d96a076c0 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index edc225016..571600dc7 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index 081362d2a..9b53028ae 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="300816" +version="211016" #### Variables #### diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index ff324c434..3e3ac1001 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 2716a27e9..bbdcd7d2f 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index 0a45df162..b51756a58 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 2e28481b6..90c88c882 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/Insurgency/insserver b/Insurgency/insserver index ba49fb494..bf25a1e16 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="161001" +version="211016" #### Variables #### diff --git a/JustCause2/jc2server b/JustCause2/jc2server index af5e1e0af..069d8d5cd 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 09ad60899..43fb5a3bf 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index d05cd9a79..937d5eb3a 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index bddcaae9e..3a26a1442 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/Minecraft/mcserver b/Minecraft/mcserver index 6317fb9bc..859d1f9dd 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -4,12 +4,12 @@ # Author: Daniel Gibbs # Website: https://gameservermanagers.com if [ -f ".dev-debug" ]; then - exec 5>dev-debug.log - BASH_XTRACEFD="5" - set -x + exec 5>dev-debug.log + BASH_XTRACEFD="5" + set -x fi -version="210816" +version="211016" #### Variables #### @@ -91,36 +91,36 @@ filename="${github_file_url_name}" githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" # If the file is missing, then download if [ ! -f "${filedir}/${filename}" ]; then - if [ ! -d "${filedir}" ]; then - mkdir -p "${filedir}" - fi - echo -e " fetching ${filename}...\c" - # Check curl exists and use available path - curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)" - for curlcmd in ${curlpaths} - do - if [ -x "${curlcmd}" ]; then - break - fi - done - # If curl exists download file - if [ "$(basename ${curlcmd})" == "curl" ]; then - curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1) - if [ $? -ne 0 ]; then - echo -e "\e[0;31mFAIL\e[0m\n" - echo "${curlfetch}" - echo -e "${githuburl}\n" - exit 1 - else - echo -e "\e[0;32mOK\e[0m" - fi - else - echo -e "\e[0;31mFAIL\e[0m\n" - echo "Curl is not installed!" - echo -e "" - exit 1 - fi - chmod +x "${filedir}/${filename}" + if [ ! -d "${filedir}" ]; then + mkdir -p "${filedir}" + fi + echo -e " fetching ${filename}...\c" + # Check curl exists and use available path + curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)" + for curlcmd in ${curlpaths} + do + if [ -x "${curlcmd}" ]; then + break + fi + done + # If curl exists download file + if [ "$(basename ${curlcmd})" == "curl" ]; then + curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1) + if [ $? -ne 0 ]; then + echo -e "\e[0;31mFAIL\e[0m\n" + echo "${curlfetch}" + echo -e "${githuburl}\n" + exit 1 + else + echo -e "\e[0;32mOK\e[0m" + fi + else + echo -e "\e[0;31mFAIL\e[0m\n" + echo "Curl is not installed!" + echo -e "" + exit 1 + fi + chmod +x "${filedir}/${filename}" fi source "${filedir}/${filename}" } diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index 9e2b022ec..7decb653e 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="290716" +version="211016" #### Variables #### diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 4dbc1e276..923858313 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 54b6ed226..76ca3ae37 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210916" +version="211016" #### Variables #### diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index be02bfc0e..abdba83e3 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 5013110e2..913248223 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index 5074af33e..870cd4e50 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 143c382c6..d0af5d50f 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index accf6aadf..ed96114f4 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 66b85d98e..6d4082ec6 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index ff5862808..c80e188e9 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/Rust/rustserver b/Rust/rustserver index 6e5f8f76a..9196c1ec0 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index 35b78d831..21dfeb281 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/Starbound/sbserver b/Starbound/sbserver index 197d93ee3..5b572669d 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index c89ffb88d..59b9c750e 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 972e60903..b16193239 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 4a9496d35..cf754b700 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index 2c0af6bd5..527b7324e 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="290716" +version="211016" #### Variables #### diff --git a/Teeworlds/twserver b/Teeworlds/twserver index 8ab31bbcb..a16daae1e 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index fba75083f..7811110cf 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index a5ff70a61..ff84f9979 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index 3c82b7e7b..3c6b76cc6 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index 780da1fb8..5788b40ef 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 771882279..652ac3772 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index 35642cdd6..f400c20e6 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="211016" #### Variables #### diff --git a/lgsm/functions/fn_functions b/lgsm/functions/fn_functions index 0d024beb1..758af3dbc 100644 --- a/lgsm/functions/fn_functions +++ b/lgsm/functions/fn_functions @@ -2,7 +2,7 @@ # LGSM fn_functions function # Author: Daniel Gibbs # Website: https://gameservermanagers.com -lgsm_version="210516" +lgsm_version="211016" # Description: Redirects to new core_functions.sh diff --git a/lgsm/functions/fn_getopt b/lgsm/functions/fn_getopt index cec7b51b4..0302cf1d5 100644 --- a/lgsm/functions/fn_getopt +++ b/lgsm/functions/fn_getopt @@ -2,7 +2,7 @@ # LGSM fn_getopt function # Author: Daniel Gibbs # Website: https://gameservermanagers.com -lgsm_version="210516" +lgsm_version="211016" # Description: Redirect to new core_getopt.sh diff --git a/lgsm/functions/fn_update_functions b/lgsm/functions/fn_update_functions index 7c3be31e6..a424d3352 100644 --- a/lgsm/functions/fn_update_functions +++ b/lgsm/functions/fn_update_functions @@ -2,7 +2,7 @@ # LGSM fn_update_functions function # Author: Daniel Gibbs # Website: https://gameservermanagers.com -lgsm_version="210516" +lgsm_version="211016" # Description: LEGACY FUNCTION Deletes the functions dir to allow re-downloading of functions from GitHub. From 9cd4095122aac437d3a2fa1c3fd67eb430ff6988 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 21 Oct 2016 15:30:34 +0100 Subject: [PATCH 105/114] updated version numbers --- 7DaysToDie/sdtdserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index 07f7d555d..7ec533282 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="160916" +version="211016" #### Variables #### From 2b2ba030a6384d3a2d2af5cef704648c380fc16a Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 16:53:10 +0200 Subject: [PATCH 106/114] comment --- lgsm/functions/command_backup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 199226ba9..3082c563e 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -139,6 +139,7 @@ fn_backup_clearing(){ backupscount=$(find "${backupdir}/" -type f -name "*.tar.gz"|wc -l) # How many backups exceed maxbackups backupquotadiff=$((backupscount-maxbackups)) +# How many backups exceed maxbackupdays backupsoudatedcount=$(find "${backupdir}"/ -type f -name "*.tar.gz" -mtime +"${maxbackupdays}"|wc -l) # If backup variables are set if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then From 240766b7c4e97c1bea2d3e1c88f6f7c2572d29d2 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Fri, 21 Oct 2016 16:50:06 +0200 Subject: [PATCH 107/114] New backup functionnalities # Backup maxbackups="4" maxbackupdays="30" stoponbackup="on" --- 7DaysToDie/sdtdserver | 4 +++- ARKSurvivalEvolved/arkserver | 4 +++- Arma3/arma3server | 4 +++- Battlefield1942/bf1942server | 4 +++- BlackMesa/bmdmserver | 4 +++- BladeSymphony/bsserver | 4 +++- BrainBread2/bb2server | 4 +++- CodenameCURE/ccserver | 4 +++- CounterStrike/csserver | 4 +++- CounterStrikeConditionZero/csczserver | 4 +++- CounterStrikeGlobalOffensive/csgoserver | 4 +++- CounterStrikeSource/cssserver | 4 +++- DayOfDefeat/dodserver | 4 +++- DayOfDefeatSource/dodsserver | 4 +++- DayOfInfamy/doiserver | 4 +++- DeathmatchClassic/dmcserver | 4 +++- DontStarveTogether/dstserver | 4 +++- DoubleActionBoogaloo/dabserver | 4 +++- EmpiresMod/emserver | 4 +++- FistfulOfFrags/fofserver | 4 +++- GarrysMod/gmodserver | 4 +++- GoldenEyeSource/gesserver | 4 +++- HalfLife2Deathmatch/hl2dmserver | 4 +++- HalfLifeDeathmatch/hldmserver | 4 +++- HalfLifeDeathmatchSource/hldmsserver | 4 +++- Hurtworld/hwserver | 4 +++- Insurgency/insserver | 4 +++- JustCause2/jc2server | 4 +++- KillingFloor/kfserver | 4 +++- Left4Dead/l4dserver | 4 +++- Left4Dead2/l4d2server | 4 +++- Minecraft/mcserver | 4 +++- Mumble/mumbleserver | 4 +++- NS2Combat/ns2cserver | 4 +++- NaturalSelection2/ns2server | 4 +++- NoMoreRoomInHell/nmrihserver | 4 +++- OpposingForce/opforserver | 4 +++- PiratesVikingandKnightsII/pvkiiserver | 4 +++- ProjectZomboid/pzserver | 4 +++- QuakeLive/qlserver | 4 +++- RedOrchestra/roserver | 4 +++- Ricochet/ricochetserver | 4 +++- Rust/rustserver | 4 +++- SeriousSam3BFE/ss3sserver | 4 +++- Starbound/sbserver | 4 +++- SvenCoop/svenserver | 4 +++- TeamFortress2/tf2server | 4 +++- TeamFortressClassic/tfcserver | 4 +++- TeamSpeak3/ts3server | 4 +++- Teeworlds/twserver | 4 +++- Terraria/terrariaserver | 4 +++- UnrealTournament/utserver | 4 +++- UnrealTournament2004/ut2k4server | 4 +++- UnrealTournament3/ut3server | 4 +++- UnrealTournament99/ut99server | 4 +++- WolfensteinEnemyTerritory/wetserver | 4 +++- 56 files changed, 168 insertions(+), 56 deletions(-) diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver index b6b6566b9..9eeb62a99 100644 --- a/7DaysToDie/sdtdserver +++ b/7DaysToDie/sdtdserver @@ -79,7 +79,9 @@ servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index 5c3cf7756..6263c51e0 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -84,7 +84,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" servercfgdefault="${servercfgdir}/GameUserSettings.ini" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Arma3/arma3server b/Arma3/arma3server index c7ec8d559..3d727f5f1 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -98,7 +98,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" networkcfgfullpath="${servercfgdir}/${networkcfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server index fbcf44b1d..46ebcceee 100644 --- a/Battlefield1942/bf1942server +++ b/Battlefield1942/bf1942server @@ -64,7 +64,9 @@ servercfgdir="${systemdir}/mods/bf1942/settings" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 3fa69a53b..a61821b1d 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -89,7 +89,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index e2eb22b59..c1b4a24a6 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -84,7 +84,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server index 41e46fa83..891cf2499 100644 --- a/BrainBread2/bb2server +++ b/BrainBread2/bb2server @@ -89,7 +89,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver index 91450d6c2..c888ea234 100644 --- a/CodenameCURE/ccserver +++ b/CodenameCURE/ccserver @@ -84,7 +84,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/CounterStrike/csserver b/CounterStrike/csserver index 3bb94ac05..c2be066c6 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 57cd67cca..c40692742 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 58940d70d..8e4148493 100755 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -107,7 +107,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 847f7051a..f88670455 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -89,7 +89,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index 726cef2d4..77c7ba3d7 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index c2f093202..0c6453d89 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -84,7 +84,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver index bec8d423f..e3f2d2d82 100644 --- a/DayOfInfamy/doiserver +++ b/DayOfInfamy/doiserver @@ -86,7 +86,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver index 6d2304e78..72049d7f1 100644 --- a/DeathmatchClassic/dmcserver +++ b/DeathmatchClassic/dmcserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver index 2066df512..9de0307c3 100644 --- a/DontStarveTogether/dstserver +++ b/DontStarveTogether/dstserver @@ -83,7 +83,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" servercfgdefault="${servercfgdir}/lgsm-default.ini" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver index a7e753897..4918d70e6 100644 --- a/DoubleActionBoogaloo/dabserver +++ b/DoubleActionBoogaloo/dabserver @@ -84,7 +84,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver index 37b746012..e923651da 100644 --- a/EmpiresMod/emserver +++ b/EmpiresMod/emserver @@ -89,7 +89,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index 9d89c5975..c57cb963f 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -84,7 +84,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 257643966..ce9ee4494 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -106,7 +106,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver index c1e12f2ce..ecd664093 100644 --- a/GoldenEyeSource/gesserver +++ b/GoldenEyeSource/gesserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index 77ff51fe5..56c57d6c9 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver index 8138ba5c3..e29839462 100644 --- a/HalfLifeDeathmatch/hldmserver +++ b/HalfLifeDeathmatch/hldmserver @@ -78,7 +78,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver index e8c0fdaac..69ed525ee 100644 --- a/HalfLifeDeathmatchSource/hldmsserver +++ b/HalfLifeDeathmatchSource/hldmsserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver index 64d6c70f9..d6497b83d 100644 --- a/Hurtworld/hwserver +++ b/Hurtworld/hwserver @@ -98,7 +98,9 @@ else fi # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Insurgency/insserver b/Insurgency/insserver index 67069ed4e..424b559ad 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -86,7 +86,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/JustCause2/jc2server b/JustCause2/jc2server index e23bd6340..95ca86cb5 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -77,7 +77,9 @@ servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index 1bcc2d721..a2e9e3f9a 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -84,7 +84,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index bcf389a35..ef8e2e4b9 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -84,7 +84,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index e5066d86b..41a0e9ac9 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -83,7 +83,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Minecraft/mcserver b/Minecraft/mcserver index cbf68024f..c086b0d4b 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -65,7 +65,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" servercfgdefault="${servercfgdir}/lgsm-default.ini" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index e774cea7d..c298d90a3 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -65,7 +65,9 @@ servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver index 772522815..283182a26 100644 --- a/NS2Combat/ns2cserver +++ b/NS2Combat/ns2cserver @@ -90,7 +90,9 @@ servercfgfullpath="${servercfgdir}" modstoragedir="${servercfgdir}/Workshop" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 967a4715f..91464bd2c 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -90,7 +90,9 @@ servercfgfullpath="${servercfgdir}" modstoragedir="${servercfgdir}/Workshop" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index 4c9f3044e..0e795cd0d 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -89,7 +89,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver index 597f82a69..aa41c633d 100644 --- a/OpposingForce/opforserver +++ b/OpposingForce/opforserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver index 5192f77a2..b953b98e9 100644 --- a/PiratesVikingandKnightsII/pvkiiserver +++ b/PiratesVikingandKnightsII/pvkiiserver @@ -84,7 +84,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver index 2e898f041..17a8b1a6a 100644 --- a/ProjectZomboid/pzserver +++ b/ProjectZomboid/pzserver @@ -80,7 +80,9 @@ servercfgdir="${HOME}/Zomboid/Server" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver index 44246a67f..f3e9e01ae 100755 --- a/QuakeLive/qlserver +++ b/QuakeLive/qlserver @@ -87,7 +87,9 @@ servercfgdir="${filesdir}/baseq3" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index c2c4eaa4f..c168b403d 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -75,7 +75,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver index ee538a8e2..cce21777f 100644 --- a/Ricochet/ricochetserver +++ b/Ricochet/ricochetserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Rust/rustserver b/Rust/rustserver index 7d515b1f0..ec4cbcf47 100644 --- a/Rust/rustserver +++ b/Rust/rustserver @@ -102,7 +102,9 @@ servercfgdir="${serveridentitydir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver index 56f7f5bd9..e72fc8af7 100644 --- a/SeriousSam3BFE/ss3sserver +++ b/SeriousSam3BFE/ss3sserver @@ -79,7 +79,9 @@ servercfgdir="${filesdir}/Content/SeriousSam3/Config" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Starbound/sbserver b/Starbound/sbserver index cc6a1f462..412666137 100644 --- a/Starbound/sbserver +++ b/Starbound/sbserver @@ -78,7 +78,9 @@ servercfgdir="${filesdir}/storage" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/SvenCoop/svenserver b/SvenCoop/svenserver index a27645c02..cd0183f8d 100644 --- a/SvenCoop/svenserver +++ b/SvenCoop/svenserver @@ -83,7 +83,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 1255ad0b5..9f668e6e9 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -89,7 +89,9 @@ servercfgdir="${systemdir}/cfg" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 5cbb7dcb4..0358fb3a3 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -79,7 +79,9 @@ servercfgdir="${systemdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server index fb8d4e24b..1ccb6dac5 100644 --- a/TeamSpeak3/ts3server +++ b/TeamSpeak3/ts3server @@ -52,7 +52,9 @@ servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Teeworlds/twserver b/Teeworlds/twserver index 4010ea6b3..ded4d5a65 100644 --- a/Teeworlds/twserver +++ b/Teeworlds/twserver @@ -74,7 +74,9 @@ servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver index d0564fb87..39a52b54a 100644 --- a/Terraria/terrariaserver +++ b/Terraria/terrariaserver @@ -74,7 +74,9 @@ servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver index fd20b128a..aaa9d69af 100644 --- a/UnrealTournament/utserver +++ b/UnrealTournament/utserver @@ -70,7 +70,9 @@ servercfgdir="${systemdir}/UnrealTournament/Saved/Config/LinuxServer" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index c86b2f824..7f50fdb97 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -58,7 +58,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server index 21e8ba06f..85179800d 100644 --- a/UnrealTournament3/ut3server +++ b/UnrealTournament3/ut3server @@ -78,7 +78,9 @@ servercfgdir="${systemdir}/UTGame/Config" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 388b03e25..fe9e1965f 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -67,7 +67,9 @@ servercfgfullpath="${servercfgdir}/${servercfg}" compressedmapsdir="${rootdir}/Maps-Compressed" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver index 16358debe..087fd5561 100644 --- a/WolfensteinEnemyTerritory/wetserver +++ b/WolfensteinEnemyTerritory/wetserver @@ -64,7 +64,9 @@ servercfgdir="${systemdir}/etmain" servercfgfullpath="${servercfgdir}/${servercfg}" # Backup -backupdays="30" +maxbackups="4" +maxbackupdays="30" +stoponbackup="on" backupdir="${rootdir}/backups" # Logging From 530fcd2686c4b783454f3bc3f109ad1975f16cc2 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 21 Oct 2016 15:54:04 +0100 Subject: [PATCH 108/114] Removing very old functions for legacy code If you havnt updated your scripts by now you really need to. --- functions/command_update_functions.sh | 38 -------------- functions/core_functions.sh | 72 --------------------------- functions/core_getopt.sh | 14 ------ functions/fn_functions | 15 ------ functions/fn_getopt | 14 ------ functions/fn_update_functions | 15 ------ functions/update_functions.sh | 15 ------ 7 files changed, 183 deletions(-) delete mode 100644 functions/command_update_functions.sh delete mode 100644 functions/core_functions.sh delete mode 100644 functions/core_getopt.sh delete mode 100644 functions/fn_functions delete mode 100644 functions/fn_getopt delete mode 100644 functions/fn_update_functions delete mode 100644 functions/update_functions.sh diff --git a/functions/command_update_functions.sh b/functions/command_update_functions.sh deleted file mode 100644 index 0c35eb1f0..000000000 --- a/functions/command_update_functions.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# LGSM command_update_functions.sh function -# Author: Daniel Gibbs -# Website: https://gameservermanagers.com -lgsm_version="210516" - -# Description: Deletes the functions dir to allow re-downloading of functions from GitHub. - -local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" -check.sh -fn_print_dots "Updating functions" -fn_script_log "Updating functions" -sleep 1 -echo -ne "\n" - -# Removed legecy functions dir -if [ -n "${rootdir}" ]; then - if [ -d "${rootdir}/functions/" ]; then - rm -rfv "${rootdir}/functions/" - exitcode=$? - fi -fi - -if [ -n "${functionsdir}" ]; then - if [ -d "${functionsdir}" ]; then - rm -rfv "${functionsdir}/"* - exitcode=$? - fi -fi - -if [ "${exitcode}" == "0" ]; then - fn_print_ok "Updating functions" - fn_script_log "Success! Updating functions" -else - fn_print_fail "Updating functions" - fn_script_log "Failure! Updating functions" -fi -echo -ne "\n" \ No newline at end of file diff --git a/functions/core_functions.sh b/functions/core_functions.sh deleted file mode 100644 index 287a50897..000000000 --- a/functions/core_functions.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# LGSM core_functions.sh function -# Author: Daniel Gibbs -# Website: https://gameservermanagers.com -lgsm_version="210516" - -# Description: REDIRECT FUNCTION to new location for core_functions.sh - -# fn_fetch_core_dl also placed here to allow legecy servers to still download core functions -if [ -z "${lgsmdir}" ]; then - lgsmdir="${rootdir}/lgsm" - functionsdir="${lgsmdir}/functions" - libdir="${lgsmdir}/lib" -fi - -fn_fetch_core_dl(){ -if [ -z "${githubuser}" ]; then - githubuser="GameServerManagers" -fi -if [ -z "${githubrepo}" ]; then - githubrepo="LinuxGSM" -fi -if [ -z "${githubbranch}" ]; then - githubbranch="master" -fi -github_file_url_dir="lgsm/functions" -github_file_url_name="${functionfile}" -filedir="${functionsdir}" -filename="${github_file_url_name}" -githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}" -# If the file is missing, then download -if [ ! -f "${filedir}/${filename}" ]; then - if [ ! -d "${filedir}" ]; then - mkdir -p "${filedir}" - fi - echo -e " fetching ${filename}...\c" - # Check curl exists and use available path - curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)" - for curlcmd in ${curlpaths} - do - if [ -x "${curlcmd}" ]; then - break - fi - done - # If curl exists download file - if [ "$(basename ${curlcmd})" == "curl" ]; then - curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1) - if [ $? -ne 0 ]; then - echo -e "${red}FAIL${default}\n" - echo "${curlfetch}" - echo -e "${githuburl}\n" - exit 1 - else - echo -e "${green}OK${default}" - fi - else - echo -e "${red}FAIL${default}\n" - echo "Curl is not installed!" - echo -e "" - exit 1 - fi - chmod +x "${filedir}/${filename}" -fi -source "${filedir}/${filename}" -} - -core_functions.sh(){ -functionfile="${FUNCNAME}" -fn_fetch_core_dl -} - -core_functions.sh diff --git a/functions/core_getopt.sh b/functions/core_getopt.sh deleted file mode 100644 index f6032fae6..000000000 --- a/functions/core_getopt.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# LGSM core_getopt.sh function -# Author: Daniel Gibbs -# Website: https://gameservermanagers.com -lgsm_version="210516" - -# Description: REDIRECT FUNCTION to new location for core_getopt.sh - -core_getopt.sh(){ -functionfile="${FUNCNAME}" -fn_fetch_core_dl -} - -core_getopt.sh \ No newline at end of file diff --git a/functions/fn_functions b/functions/fn_functions deleted file mode 100644 index 2ae012923..000000000 --- a/functions/fn_functions +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# LGSM fn_functions function -# Author: Daniel Gibbs -# Website: https://gameservermanagers.com -lgsm_version="210516" - -# Description: REDIRECT FUNCTION to new core_functions.sh - -core_functions.sh(){ -# Functions are defined in core_functions.sh. -functionfile="${FUNCNAME}" -fn_runfunction -} - -core_functions.sh \ No newline at end of file diff --git a/functions/fn_getopt b/functions/fn_getopt deleted file mode 100644 index 0b0e3713d..000000000 --- a/functions/fn_getopt +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# LGSM fn_getopt.sh function -# Author: Daniel Gibbs -# Website: https://gameservermanagers.com -lgsm_version="210516" - -# Description: REDIRECT FUNCTION to new core_getopt.sh - -core_getopt.sh(){ -functionfile="${FUNCNAME}" -fn_fetch_core_dl -} - -core_getopt.sh \ No newline at end of file diff --git a/functions/fn_update_functions b/functions/fn_update_functions deleted file mode 100644 index 5513d5d20..000000000 --- a/functions/fn_update_functions +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# LGSM fn_update_functions function -# Author: Daniel Gibbs -# Website: https://gameservermanagers.com -lgsm_version="210516" - -# Description: REDIRECT FUNCTION to new command_update_functions.sh - -command_update_functions.sh(){ -functionfile="${FUNCNAME}" -fn_runfunction -} - -command_update_functions.sh - diff --git a/functions/update_functions.sh b/functions/update_functions.sh deleted file mode 100644 index 5513d5d20..000000000 --- a/functions/update_functions.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# LGSM fn_update_functions function -# Author: Daniel Gibbs -# Website: https://gameservermanagers.com -lgsm_version="210516" - -# Description: REDIRECT FUNCTION to new command_update_functions.sh - -command_update_functions.sh(){ -functionfile="${FUNCNAME}" -fn_runfunction -} - -command_update_functions.sh - From 639dcb4dbeed6084715b298c4f86fb1e7748c844 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 21 Oct 2016 16:04:39 +0100 Subject: [PATCH 109/114] Removed appmanifest files as no longer required --- appmanifest/appmanifest_10.acf | 22 -------------------- appmanifest/appmanifest_70.acf | 22 -------------------- appmanifest/appmanifest_90.acf | 28 ------------------------- appmanifest/czero/appmanifest_90.acf | 31 ---------------------------- appmanifest/dod/appmanifest_90.acf | 31 ---------------------------- appmanifest/tfc/appmanifest_90.acf | 31 ---------------------------- 6 files changed, 165 deletions(-) delete mode 100644 appmanifest/appmanifest_10.acf delete mode 100644 appmanifest/appmanifest_70.acf delete mode 100644 appmanifest/appmanifest_90.acf delete mode 100644 appmanifest/czero/appmanifest_90.acf delete mode 100644 appmanifest/dod/appmanifest_90.acf delete mode 100644 appmanifest/tfc/appmanifest_90.acf diff --git a/appmanifest/appmanifest_10.acf b/appmanifest/appmanifest_10.acf deleted file mode 100644 index 9217b6129..000000000 --- a/appmanifest/appmanifest_10.acf +++ /dev/null @@ -1,22 +0,0 @@ -"AppState" -{ - "AppID" "10" - "Universe" "1" - "StateFlags" "1090" - "installdir" "Half-Life" - "LastUpdated" "0" - "UpdateResult" "0" - "SizeOnDisk" "0" - "buildid" "0" - "LastOwner" "0" - "BytesToDownload" "0" - "BytesDownloaded" "0" - "AutoUpdateBehavior" "0" - "AllowOtherDownloadsWhileRunning" "0" - "UserConfig" - { - } - "MountedDepots" - { - } -} diff --git a/appmanifest/appmanifest_70.acf b/appmanifest/appmanifest_70.acf deleted file mode 100644 index e5d6f2807..000000000 --- a/appmanifest/appmanifest_70.acf +++ /dev/null @@ -1,22 +0,0 @@ -"AppState" -{ - "AppID" "70" - "Universe" "1" - "StateFlags" "1090" - "installdir" "Half-Life" - "LastUpdated" "0" - "UpdateResult" "0" - "SizeOnDisk" "0" - "buildid" "0" - "LastOwner" "0" - "BytesToDownload" "0" - "BytesDownloaded" "0" - "AutoUpdateBehavior" "0" - "AllowOtherDownloadsWhileRunning" "0" - "UserConfig" - { - } - "MountedDepots" - { - } -} diff --git a/appmanifest/appmanifest_90.acf b/appmanifest/appmanifest_90.acf deleted file mode 100644 index 7de939d34..000000000 --- a/appmanifest/appmanifest_90.acf +++ /dev/null @@ -1,28 +0,0 @@ -"AppState" -{ - "AppID" "90" - "Universe" "1" - "StateFlags" "1026" - "installdir" "Half-Life" - "LastUpdated" "0" - "UpdateResult" "0" - "SizeOnDisk" "0" - "buildid" "0" - "LastOwner" "0" - "BytesToDownload" "0" - "BytesDownloaded" "0" - "AutoUpdateBehavior" "0" - "AllowOtherDownloadsWhileRunning" "0" - "UserConfig" - { - } - "MountedDepots" - { - } - "SharedDepots" - { - "1" "70" - "11" "10" - "71" "70" - } -} diff --git a/appmanifest/czero/appmanifest_90.acf b/appmanifest/czero/appmanifest_90.acf deleted file mode 100644 index 2373e5421..000000000 --- a/appmanifest/czero/appmanifest_90.acf +++ /dev/null @@ -1,31 +0,0 @@ -"AppState" -{ - "appid" "90" - "Universe" "1" - "StateFlags" "4" - "installdir" "Half-Life" - "LastUpdated" "1390662869" - "UpdateResult" "0" - "SizeOnDisk" "41586625" - "buildid" "63549" - "LastOwner" "76561199609699388" - "BytesToDownload" "224501136" - "BytesDownloaded" "224501136" - "AutoUpdateBehavior" "0" - "AllowOtherDownloadsWhileRunning" "0" - "UserConfig" - { - "mod" "czero" - } - "MountedDepots" - { - "4" "3196956435784640171" - } - "SharedDepots" - { - "1" "70" - "11" "10" - "71" "70" - "81" "80" - } -} diff --git a/appmanifest/dod/appmanifest_90.acf b/appmanifest/dod/appmanifest_90.acf deleted file mode 100644 index 704e4d1f0..000000000 --- a/appmanifest/dod/appmanifest_90.acf +++ /dev/null @@ -1,31 +0,0 @@ -"AppState" -{ - "AppID" "90" - "Universe" "1" - "StateFlags" "1030" - "installdir" "Half-Life" - "LastUpdated" "1390652241" - "UpdateResult" "0" - "SizeOnDisk" "41586625" - "buildid" "63549" - "LastOwner" "76561201453793332" - "BytesToDownload" "236411088" - "BytesDownloaded" "0" - "AutoUpdateBehavior" "0" - "AllowOtherDownloadsWhileRunning" "0" - "UserConfig" - { - "mod" "dod" - } - "MountedDepots" - { - "4" "3196956435784640171" - } - "SharedDepots" - { - "1" "70" - "11" "10" - "71" "70" - "31" "30" - } -} diff --git a/appmanifest/tfc/appmanifest_90.acf b/appmanifest/tfc/appmanifest_90.acf deleted file mode 100644 index aa3f4e2a9..000000000 --- a/appmanifest/tfc/appmanifest_90.acf +++ /dev/null @@ -1,31 +0,0 @@ -"AppState" -{ - "AppID" "90" - "Universe" "1" - "StateFlags" "4" - "installdir" "Half-Life" - "LastUpdated" "1390765182" - "UpdateResult" "0" - "SizeOnDisk" "41586625" - "buildid" "63549" - "LastOwner" "76561198445953036" - "BytesToDownload" "62362560" - "BytesDownloaded" "0" - "AutoUpdateBehavior" "0" - "AllowOtherDownloadsWhileRunning" "0" - "UserConfig" - { - "mod" "tfc" - } - "MountedDepots" - { - "4" "3196956435784640171" - } - "SharedDepots" - { - "1" "70" - "11" "10" - "71" "70" - "21" "20" - } -} From f1722339950a685d25488305ddeddd95951546e4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 22 Oct 2016 12:05:33 +0100 Subject: [PATCH 110/114] Added quake 2 details --- lgsm/functions/command_details.sh | 11 +++++++++++ lgsm/functions/info_config.sh | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index fe37083df..126dbe3b3 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -386,6 +386,15 @@ fn_details_refractor(){ } | column -s $'\t' -t } +fn_details_quake2(){ + echo -e "netstat -atunp | grep quake2" + echo -e "" + { + echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL" + echo -e "> Game\tINBOUND\t${port}\tudp" + } | column -s $'\t' -t +} + fn_details_quake3(){ echo -e "netstat -atunp | grep q3ded" echo -e "" @@ -674,6 +683,8 @@ fn_display_details() { fn_details_ark elif [ "${gamename}" == "Hurtworld" ]; then fn_details_hurtworld + elif [ "${gamename}" == "Quake 2" ]; then + fn_details_quake2 elif [ "${gamename}" == "Quake 3: Arena" ]; then fn_details_quake3 elif [ "${gamename}" == "Quake Live" ]; then diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 846dec349..948e15201 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -154,6 +154,24 @@ fn_info_config_projectzomboid(){ fi } +fn_info_config_quake2(){ + if [ ! -f "${servercfgfullpath}" ]; then + rconpassword="${unavailable}" + servername="${unavailable}" + serverpassword="${unavailable}" + slots="${zero}" + else + rconpassword=$(grep "rcon_password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set rcon_password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + servername=$(grep "hostname" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^\//d' -e 's/set hostname//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//') + slots=$(grep "maxclients" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') + + # Not Set + rconpassword=${rconpassword:-"NOT SET"} + servername=${servername:-"NOT SET"} + slots=${slots:-"0"} + fi +} + fn_info_config_quake3(){ if [ ! -f "${servercfgfullpath}" ]; then rconpassword="${unavailable}" From a0b6c9dc03d1829a29d06b512f35f80a81f84d40 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 22 Oct 2016 12:14:26 +0100 Subject: [PATCH 111/114] Added missing if statements --- lgsm/functions/command_details.sh | 2 +- lgsm/functions/info_config.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh index 126dbe3b3..af30b9a27 100644 --- a/lgsm/functions/command_details.sh +++ b/lgsm/functions/command_details.sh @@ -292,7 +292,7 @@ fn_details_ports(){ parmslocation="${red}UNKNOWN${default}" # engines that require editing in the config file - local ports_edit_array=( "avalanche" "dontstarve" "idtech3" "lwjgl2" "projectzomboid" "idtech3_ql" "refractor" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) + local ports_edit_array=( "avalanche" "dontstarve" "idtech2" "idtech3" "lwjgl2" "projectzomboid" "idtech3_ql" "refractor" "realvirtuality" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" ) for port_edit in "${ports_edit_array[@]}" do if [ "${engine}" == "${port_edit}" ]||[ "${gamename}" == "${port_edit}" ]; then diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index 948e15201..7982ebd69 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -513,6 +513,9 @@ elif [ "${gamename}" == "Battlefield: 1942" ]; then # Dont Starve Together elif [ "${engine}" == "dontstarve" ]; then fn_info_config_dontstarve +# Quake 2 +elif [ "${gamename}" == "Quake 2" ]; then + fn_info_config_quake2 # Quake 3 elif [ "${gamename}" == "Quake 3: Arena" ]; then fn_info_config_quake3 From 5e737a997a40a337b85d88f4d0a54fdfdc751fdb Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 22 Oct 2016 17:07:46 +0200 Subject: [PATCH 112/114] Should fix missing cached mem #1143 Please, test on ubuntu to confirm it's working --- 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 3416e8133..df079567d 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -73,6 +73,9 @@ physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}') physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}') physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}') physmemcached=$(free ${humanreadable} | awk '/cache:/ {print $4}') +if [ -z "${physmemcached} ]; then + physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $5}') +fi swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}') swapfree=$(free ${humanreadable} | awk '/Swap:/ {print $4}') From bd77c9fa6892b7d6300b57d204bae3508a93f5bd Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 22 Oct 2016 17:17:04 +0200 Subject: [PATCH 113/114] fix the fix for #1143 (close double quote) --- 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 df079567d..f526b4328 100644 --- a/lgsm/functions/info_distro.sh +++ b/lgsm/functions/info_distro.sh @@ -73,7 +73,7 @@ physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}') physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}') physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}') physmemcached=$(free ${humanreadable} | awk '/cache:/ {print $4}') -if [ -z "${physmemcached} ]; then +if [ -z "${physmemcached}" ]; then physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $5}') fi swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}') From 01c3f90bb9517a602f5130cb596f03b2ef1dce79 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 22 Oct 2016 17:36:17 +0200 Subject: [PATCH 114/114] move -type f before -mtime --- lgsm/functions/command_backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh index 3082c563e..489e0a8f4 100644 --- a/lgsm/functions/command_backup.sh +++ b/lgsm/functions/command_backup.sh @@ -160,7 +160,7 @@ if [ -n "${maxbackupdays}" ]&&[ -n "${maxbackups}" ]; then # Display how many backups will be cleared fn_print_info_nl "${backupsoudatedcount} backup(s) older than ${maxbackupdays} days will be cleared." fn_script_log "${backupsoudatedcount} backup(s) older than ${maxbackupdays} days will be cleared" - find "${backupdir}"/ -mtime +"${maxbackupdays}" -type f -exec rm -f {} \; + find "${backupdir}"/ -type f -mtime +"${maxbackupdays}" -exec rm -f {} \; fn_print_ok_nl "Cleared ${backupsoudatedcount} backup(s)." fn_script_log_pass "Cleared ${backupsoudatedcount} backup(s)" else