From 61a17c2b346e3f7197ff21c3c2fa20f653d362db Mon Sep 17 00:00:00 2001 From: Felix Beckmann Date: Thu, 17 Mar 2016 21:18:59 +0100 Subject: [PATCH 01/11] When we say exit we should exit --- functions/command_ts3_server_pass.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index 3cd0f0b1f..b8969a557 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -24,7 +24,7 @@ while true; do read -e -i "y" -p "Continue? [y/N]" yn case $yn in [Yy]* ) break;; - [Nn]* ) echo Exiting; return;; + [Nn]* ) echo Exiting; exit;; * ) echo "Please answer yes or no.";; esac done @@ -59,4 +59,4 @@ if [ "${ts3status}" == "Server is running" ]; then command_start.sh else fn_serveradmin_password_set -fi \ No newline at end of file +fi From d3086275d09e3db552a9ca6cba222199f59de47c Mon Sep 17 00:00:00 2001 From: Felix Beckmann Date: Fri, 18 Mar 2016 22:54:20 +0100 Subject: [PATCH 02/11] Should always start the server with the inifile If we don't start the server with the ini he may also not load the right sql plugin. --- functions/command_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/command_start.sh b/functions/command_start.sh index 309a8078f..5a6ae2569 100644 --- a/functions/command_start.sh +++ b/functions/command_start.sh @@ -56,7 +56,7 @@ mv "${scriptlog}" "${scriptlogdate}" date > "${rootdir}/${lockselfname}" cd "${executabledir}" if [ "${ts3serverpass}" == "1" ];then - ./ts3server_startscript.sh start serveradmin_password="${newpassword}" + ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" else ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 fi From dc9b586a1c1396fb39359b8f6c4c636854102b17 Mon Sep 17 00:00:00 2001 From: Felix Beckmann Date: Fri, 18 Mar 2016 22:57:37 +0100 Subject: [PATCH 03/11] Set ts3serverpass to 0 after password change After we started the server with the new password we should reset the ts3serverpass variable otherwise it would start the server again in new password mode. --- functions/command_ts3_server_pass.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/command_ts3_server_pass.sh b/functions/command_ts3_server_pass.sh index b8969a557..a1f1fce0a 100644 --- a/functions/command_ts3_server_pass.sh +++ b/functions/command_ts3_server_pass.sh @@ -45,6 +45,7 @@ fn_printinfonl "Starting server with new password" command_start.sh # Stop server in "new password mode" command_stop.sh +ts3serverpass="0" fn_printoknl "Password applied" fn_scriptlog "New ServerAdmin password applied" sleep 1 From ee71fe5fad3b0e534d46d5795c6659acb5e50a0b Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 19 Mar 2016 00:44:22 +0100 Subject: [PATCH 04/11] Fixed backing up folders + size info & appearance --- functions/command_backup.sh | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/functions/command_backup.sh b/functions/command_backup.sh index 5f923ad07..6a64b5dea 100644 --- a/functions/command_backup.sh +++ b/functions/command_backup.sh @@ -2,7 +2,7 @@ # LGSM command_backup.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="271215" +lgsm_version="180316" # Description: Creates a .tar.gz file in the backup directory. @@ -12,11 +12,7 @@ function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" check.sh backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')" echo "" -echo "${gamename} Backup" -echo "============================" -echo "" -echo "The following backup will be created:" -echo "" +fn_printinfonl "A total of $(du -sh "${rootdir}" --exclude="${backupdir}" | awk '{print $1}') will be compressed into the following backup:" echo "${backupdir}/${backupname}.tar.gz" echo "" while true; do @@ -27,6 +23,7 @@ while true; do * ) echo "Please answer yes or no.";; esac done +echo "" tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -Ec "^${servicename}:") if [ "${tmuxwc}" -eq 1 ]; then echo "" @@ -41,24 +38,14 @@ if [ "${tmuxwc}" -eq 1 ]; then esac done fi -fn_scriptlog "Started" -echo -en "starting backup.\r" -sleep 1 -echo -en "starting backup..\r" -sleep 1 -echo -en "starting backup...\r" -sleep 1 -echo -en "\n" -cd "${rootdir}" +fn_scriptlog "Started backup" +fn_printdots "Starting backup, please wait..." +sleep 2 if [ ! -d "${backupdir}" ]; then - mkdir -v "${backupdir}" + mkdir "${backupdir}" fi -tar -cvzf "${backupdir}/${backupname}.tar.gz" --exclude "${backupdir}" ./* +tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* echo "" -echo "Backup created: ${backupdir}/${backupname}.tar.gz" -fn_scriptlog "Created: ${backupdir}/${backupname}.tar.gz" +fn_printoknl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" +fn_scriptlog "Complete, Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" sleep 1 -echo "" -fn_printcompletenl "Complete." -fn_scriptlog "Complete" -echo "" From 736036469e87148c80798bdea343c7a840d8f8cf Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 19 Mar 2016 00:48:38 +0100 Subject: [PATCH 05/11] backup in progress text --- functions/command_backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/command_backup.sh b/functions/command_backup.sh index 6a64b5dea..5cc2aa0ed 100644 --- a/functions/command_backup.sh +++ b/functions/command_backup.sh @@ -39,7 +39,7 @@ if [ "${tmuxwc}" -eq 1 ]; then done fi fn_scriptlog "Started backup" -fn_printdots "Starting backup, please wait..." +fn_printdots "Backup in progress, please wait..." sleep 2 if [ ! -d "${backupdir}" ]; then mkdir "${backupdir}" From 7601c9f8a1cf329074972ad35fdc0a8749f1ceb9 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 19 Mar 2016 01:00:14 +0100 Subject: [PATCH 06/11] removed extra echo --- functions/command_backup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/functions/command_backup.sh b/functions/command_backup.sh index 5cc2aa0ed..931c9516c 100644 --- a/functions/command_backup.sh +++ b/functions/command_backup.sh @@ -45,7 +45,6 @@ if [ ! -d "${backupdir}" ]; then mkdir "${backupdir}" fi tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./* -echo "" fn_printoknl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" fn_scriptlog "Complete, Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" sleep 1 From aabbe9b4639d6d722fef048801809b4adc8b30e7 Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Sat, 19 Mar 2016 01:23:54 +0100 Subject: [PATCH 07/11] echo at the right place --- functions/command_backup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions/command_backup.sh b/functions/command_backup.sh index 931c9516c..ae50f13be 100644 --- a/functions/command_backup.sh +++ b/functions/command_backup.sh @@ -2,7 +2,7 @@ # LGSM command_backup.sh function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -lgsm_version="180316" +lgsm_version="190316" # Description: Creates a .tar.gz file in the backup directory. @@ -48,3 +48,4 @@ tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" fn_printoknl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" fn_scriptlog "Complete, Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size" sleep 1 +echo "" From 172e2fbb94ffb0da56ab85d719da4e86670fff35 Mon Sep 17 00:00:00 2001 From: Flightkick Date: Wed, 23 Mar 2016 15:28:07 +0100 Subject: [PATCH 08/11] Removed Executable + Argumens Fixes #766 --- functions/email.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/functions/email.sh b/functions/email.sh index 93d259d80..361c9d8bf 100644 --- a/functions/email.sh +++ b/functions/email.sh @@ -48,9 +48,6 @@ fn_parms echo -e "\e[34mBackups:\t\e[0m${backupdirdu}" fi echo -e "" - echo -e "========================================\nCommand-line Parameters\n========================================" - echo -e "${executable} ${parms}" - echo -e "" echo -e "========================================\nLogs\n========================================" }| sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee "${scriptlogdir}/${servicename}-email.log" > /dev/null 2>&1 echo -e "\n\n Script log\n===================" >> "${emaillog}" From 906a2d76bddb0bf95bd9a5335ed556dc4f380838 Mon Sep 17 00:00:00 2001 From: Dom Date: Sat, 2 Apr 2016 10:37:48 +0200 Subject: [PATCH 09/11] Update install_ut2k4_key.sh The old URL gives a 404. --- functions/install_ut2k4_key.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/install_ut2k4_key.sh b/functions/install_ut2k4_key.sh index 35a9599f6..b959cf96b 100644 --- a/functions/install_ut2k4_key.sh +++ b/functions/install_ut2k4_key.sh @@ -10,10 +10,10 @@ echo "=================================" sleep 1 echo "To get your server listed on the Master Server list" echo "you must get a free CD key. Get a key here:" -echo "http://www.unrealtournament.com/ut2004server/cdkey.php" +echo "https://forums.unrealtournament.com/utserver/cdkey.php?2004" echo "" echo "Once you have the key enter it below" echo -n "KEY: " read CODE echo ""\""CDKey"\""="\""${CODE}"\""" > "${systemdir}/cdkey" -echo "" \ No newline at end of file +echo "" From 12c16398fb9918b552cfe148c262d3b7781c1a30 Mon Sep 17 00:00:00 2001 From: lanrenags Date: Wed, 20 Apr 2016 00:51:51 +0200 Subject: [PATCH 10/11] Update tfcserver typo --- TeamFortressClassic/tfcserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index d1ee8b4c3..82f4583ff 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -46,7 +46,7 @@ githubbranch="master" # Steam appid="90" -appidmos="tfc" +appidmod="tfc" # Server Details servicename="tfc-server" From 4bc1e8d52f253dec5c57d68f364b24550fac7a31 Mon Sep 17 00:00:00 2001 From: mhsjlw Date: Sat, 23 Apr 2016 20:28:58 -0400 Subject: [PATCH 11/11] fix grammar --- functions/install_logs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/install_logs.sh b/functions/install_logs.sh index 6496ad647..7d79fba6a 100644 --- a/functions/install_logs.sh +++ b/functions/install_logs.sh @@ -6,7 +6,7 @@ lgsm_version="271215" if [ "${checklogs}" != "1" ]; then echo "" - echo "Creating log directorys" + echo "Creating log directories" echo "=================================" fi sleep 1 @@ -44,4 +44,4 @@ if [ -d "${rootdir}/Steam/logs" ]; then ln -nfsv "${rootdir}/Steam/logs" "${rootdir}/log/steamcmd" fi fi -sleep 1 \ No newline at end of file +sleep 1