From 4a363c67bfd3cded9e70a0d9d822bd1c47120fa0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 27 Jun 2016 23:15:13 +0100 Subject: [PATCH] Revert "updated to ts3server code" This reverts commit 87a2d72297eddf53a8edbb3e47847b04b6682b45. --- lgsm/functions/command_start.sh | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index abaa507f3..9dbdca200 100644 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -31,26 +31,28 @@ fn_start_teamspeak3(){ if [ "${status}" != "0" ]; then fn_print_info_nl "${servername} is already running" fn_script_log_error "${servername} is already running" + core_exit.sh + fi + + mv "${scriptlog}" "${scriptlogdate}" + # Create lock file + date > "${rootdir}/${lockselfname}" + cd "${executabledir}" + if [ "${ts3serverpass}" == "1" ];then + ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" else - mv "${scriptlog}" "${scriptlogdate}" - # Create lock file - date > "${rootdir}/${lockselfname}" - cd "${executabledir}" - if [ "${ts3serverpass}" == "1" ];then - ./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" - else - ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 - fi - sleep 1 - check_status.sh - if [ "${status}" == "0" ]; then - fn_print_fail_nl "Unable to start ${servername}" - fn_script_log_fatal "Unable to start ${servername}" - echo -e " Check log files: ${rootdir}/log" - else - fn_print_ok_nl "${servername}" - fn_script_log_pass "Started ${servername}" - fi + ./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1 + fi + sleep 1 + check_status.sh + if [ "${status}" == "0" ]; then + fn_print_fail_nl "Unable to start ${servername}" + fn_script_log_fatal "Unable to start ${servername}" + echo -e " Check log files: ${rootdir}/log" + core_exit.sh + else + fn_print_ok_nl "${servername}" + fn_script_log_pass "Started ${servername}" fi }