From 826843bdcaf475755d4846e44e858ff346c54213 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 7 Nov 2015 15:30:25 +0000 Subject: [PATCH] Resolved issue reversed if --- tests/tests_jc2server.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 8cca5ecba..7922ac6c1 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -95,12 +95,10 @@ else pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:") fi -pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:") -echo "PID: ${pid}" -if [ "${pid}" == "0" ]; then - currentstatus="OFFLINE" -else +if [ "${pid}" != "0" ]||[ "${ts3status}" == "Server is running" ]; then currentstatus="ONLINE" +else + currentstatus="OFFLINE" fi } @@ -114,11 +112,10 @@ fn_setstatus(){ while [ "${requiredstatus}" != "${currentstatus}" ]; do counter=$((counter+1)) fn_currentstatus - echo "REQ: ${requiredstatus} CUR:${currentstatus}" echo -ne "New status: ${currentstatus}\\r" if [ "${requiredstatus}" == "ONLINE" ]; then - (fn_start) + (fn_start > /dev/null 2>&1) else (fn_stop > /dev/null 2>&1) fi