Quick fix for run_server script

This commit is contained in:
Deve
2018-09-12 22:08:38 +02:00
parent 60157a33c4
commit b911a31bf2

View File

@@ -116,11 +116,11 @@ run_servers()
"$CMD" --ranked \
--max-players=8 \
--min-players=2 \
--mode=3 \
--type=1 \
--port=2759 \
--difficulty=2 \
--mode=0 \
--port=2760 \
--wan-server="$SERVER_NAME" \
--stdout="$DATETIME-time_trial.log" \
--stdout="$DATETIME-normal.log" \
--stdout-dir="$STDOUT_DIR" \
--no-console-log \
--log=0 &> /dev/null &
@@ -131,10 +131,10 @@ run_servers()
--disable-polling \
--max-players=8 \
--min-players=2 \
--mode=2 \
--type=3 \
--difficulty=2 \
--mode=3 \
--soccer-goals \
--port=2760 \
--port=2761 \
--wan-server="$SERVER_NAME Soccer" \
--stdout="$DATETIME-soccer.log" \
--stdout-dir="$STDOUT_DIR" \
@@ -142,6 +142,22 @@ run_servers()
--log=0 &> /dev/null &
sleep 5
"$CMD" --owner-less \
--disable-polling \
--max-players=8 \
--min-players=2 \
--difficulty=2 \
--mode=2 \
--battle-mode=1 \
--port=2762 \
--wan-server="$SERVER_NAME CTF" \
--stdout="$DATETIME-ctf.log" \
--stdout-dir="$STDOUT_DIR" \
--no-console-log \
--log=0 &> /dev/null &
sleep 5
}
init_servers()
@@ -171,6 +187,11 @@ stop_servers()
done
sleep 10
for PID in $(pidof -x "$CMD"); do
echo "Info: Force killing the STK server $PID"
kill -9 $PID
done
}
check_servers()
@@ -184,7 +205,7 @@ check_servers()
if [ $(echo $FILE_BEGIN | grep -c "Done saving user, leaving") -gt 0 ]; then
echo "Info: Check server: Servers successfully initialized"
elif [ $(echo $FILE_BEGIN | grep -c "Server is now online.") -gt 0 ]; then
elif [ $(echo $FILE_BEGIN | grep "Server" | grep -c "is now online.") -gt 0 ]; then
echo "Info: Check server: Servers successfully created"
elif [ $(echo $FILE_BEGIN | grep -c "Specified server already exists.") -gt 0 ]; then
show_message "Error: Check server: Specified server already exists"
@@ -238,7 +259,7 @@ start()
if [ $CHECK_SERVERS -eq 1 ]; then
check_servers
fi
echo "Info: Servers started"
}