From dd5ac5577afdc198a69ac2a2e0988601ec46a7f5 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Nov 2015 13:26:33 +0000
Subject: [PATCH 01/25] Further changes

---
 .travis.yml                           |   2 +-
 test.sh                               | 484 --------------------------
 tests/{test.sh => tests_jc2server.sh} |  88 ++---
 3 files changed, 23 insertions(+), 551 deletions(-)
 delete mode 100644 test.sh
 rename tests/{test.sh => tests_jc2server.sh} (85%)

diff --git a/.travis.yml b/.travis.yml
index 4e39e2473..3594768d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,4 @@ addons:
 
 script:
 
-    - bash tests/test.sh
\ No newline at end of file
+    - bash tests/tests_jc2server.sh
\ No newline at end of file
diff --git a/test.sh b/test.sh
deleted file mode 100644
index 839b7538c..000000000
--- a/test.sh
+++ /dev/null
@@ -1,484 +0,0 @@
-#!/bin/bash
-# Just Cause 2
-# Server Management Script
-# Author: Daniel Gibbs
-# Website: http://gameservermanagers.com
-version="150715"
-
-#### Variables ####
-
-# Notification Email
-# (on|off)
-emailnotification="on"
-email="me@danielgibbs.co.uk"
-
-# Steam login
-steamuser="anonymous"
-steampass=""
-
-# Start Variables
-updateonstart="off"
-
-fn_parms(){
-parms=""
-}
-
-#### Advanced Variables ####
-
-# Steam
-appid="261140"
-
-# Server Details
-servicename="jc2-server"
-gamename="Just Cause 2"
-engine="avalanche"
-
-# Directories
-rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/jc2server"
-selfname="$(basename $0)"
-lockselfname=".${servicename}.lock"
-filesdir="${rootdir}/serverfiles"
-systemdir="${filesdir}"
-executabledir="${filesdir}"
-executable="./Jcmp-Server"
-servercfg="config.lua"
-servercfgdir="${filesdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/default_config.lua"
-backupdir="${rootdir}/backups"
-
-# Logging
-logdays="7"
-#gamelogdir="" # No server logs available
-scriptlogdir="${rootdir}/log/script"
-consolelogdir="${rootdir}/log/console"
-
-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
-
-fn_runfunction(){
-# Functions are downloaded and run with this function
-if [ ! -f "${rootdir}/functions/${functionfile}" ]; then
-	cd "${rootdir}"
-	if [ ! -d "functions" ]; then
-		mkdir functions
-	fi
-	cd functions
-	echo -e "    loading ${functionfile}...\c"
-	wget -N /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/functions/${functionfile} 2>&1 | grep -F HTTP | cut -c45-
-	chmod +x "${functionfile}"
-	cd "${rootdir}"
-fi
-source "${rootdir}/functions/${functionfile}"
-}
-
-fn_functions(){
-# Functions are defined in fn_functions.
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
-fn_functions
-
-getopt=$1
-
-fn_currentstatus(){
-pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
-if [ "${pid}" == "0" ]; then
-	currentstatus="OFFLINE"
-else
-	currentstatus="ONLINE"
-fi
-}
-	
-fn_setstatus(){
-	fn_currentstatus
-	
-	echo""
-	echo "Required status: ${requiredstatus}"
-	counter=0
-    while [  "${requiredstatus}" != "${currentstatus}" ]; do
-    	counter=$((counter+1))
-    	fn_currentstatus
-	
-    	echo -ne "Current status:  ${currentstatus}\\r"
-		if [ "${requiredstatus}" == "ONLINE" ]; then
-			(fn_start > /dev/null 2>&1)
-		else
-			(fn_stop > /dev/null 2>&1)
-		fi
-    	if [ "${counter}" -gt "5" ]; then
-    		currentstatus="FAIL"
-    		echo "Current status:  ${currentstatus}"
-    		echo ""
-    		echo "Unable to start or stop server."
-    		exit
-    	fi
-    done
-    echo -ne "Current status:  ${currentstatus}\\r"
-    echo -e "\n"
-    echo "Test starting:"
-    echo ""
-    sleep 0.5
-}
-
-echo "================================="
-echo "TravisCI Tests"
-echo "Linux Game Server Manager"
-echo "by Daniel Gibbs"
-echo "http://gameservermanagers.com"
-echo "================================="
-echo ""
-sleep 1
-echo "================================="
-echo "Generic Server Tests"
-echo "Using: ${gamename}"
-echo "================================="
-echo ""
-sleep 1
-mkdir ${rootfdir}
-
-
-echo "1.0 - start - no files"
-echo "================================="
-echo "Description:"
-echo "Test script reaction to missing server files."
-requiredstatus="OFFLINE"
-fn_setstatus
-(fn_start)
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-
-
-
-echo "2.0 - install"
-echo "================================="
-echo "Description:"
-echo "install ${gamename} server."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_autoinstall
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-
-
-
-echo "3.1 - start"
-echo "================================="
-echo "Description:"
-echo "start ${gamename} server."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_start
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "3.2 - start - online"
-echo "================================="
-echo "Description:"
-echo "start ${gamename} server while already running."
-requiredstatus="ONLINE"
-fn_setstatus
-(fn_start)
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "3.3 - start - updateonstart"
-echo "================================="
-echo "Description:"
-echo "will update server on start."
-requiredstatus="ONLINE"
-fn_setstatus
-(
-	updateonstart="on"
-	fn_start
-)
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "3.4 - stop"
-echo "================================="
-echo "Description:"
-echo "stop ${gamename} server."
-requiredstatus="ONLINE"
-fn_setstatus
-fn_stop
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "3.5 - stop - offline"
-echo "================================="
-echo "Description:"
-echo "stop ${gamename} server while already stopped."
-requiredstatus="OFFLINE"
-fn_setstatus
-(fn_stop)
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "3.6 - restart"
-echo "================================="
-echo "Description:"
-echo "restart ${gamename}."
-requiredstatus="ONLINE"
-fn_setstatus
-fn_restart
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "3.7 - restart - offline"
-echo "================================="
-echo "Description:"
-echo "restart ${gamename} while already stopped."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_restart
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-
-
-
-echo "4.1 - update"
-echo "================================="
-echo "Description:"
-echo "check for updates."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_update_check
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "4.2 - update  - change buildid"
-echo "================================="
-echo "Description:"
-echo "change the buildid tricking SteamCMD to update."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_printinfonl "changed buildid to 0."
-sed -i 's/[0-9]\+/0/' ${filesdir}/steamapps/appmanifest_${appid}.acf
-fn_update_check
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "4.3 - update  - change buildid - online"
-echo "================================="
-echo "Description:"
-echo "change the buildid tricking SteamCMD to update server while already running."
-requiredstatus="ONLINE"
-fn_setstatus
-fn_printinfonl "changed buildid to 0."
-sed -i 's/[0-9]\+/0/' ${filesdir}/steamapps/appmanifest_${appid}.acf
-fn_update_check
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "4.4 - update  - remove appmanifest file"
-echo "================================="
-echo "Description:"
-echo "removing appmanifest file will cause script to repair."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_printinfonl "removed appmanifest_${appid}.acf."
-rm --verbose "${filesdir}/steamapps/appmanifest_${appid}.acf"
-fn_update_check
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "4.5 - force-update"
-echo "================================="
-echo "Description:"
-echo "force-update bypassing update check."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_update_check
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "4.6 - force-update - online"
-echo "================================="
-echo "Description:"
-echo "force-update bypassing update check server while already running."
-requiredstatus="ONLINE"
-fn_setstatus
-fn_update_check
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "4.7 - validate"
-echo "================================="
-echo "Description:"
-echo "validate server files."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_validate
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "4.8 - validate - online"
-echo "================================="
-echo "Description:"
-echo "validate server files while server while already running."
-requiredstatus="ONLINE"
-fn_setstatus
-fn_validate
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-
-
-
-echo "5.1 - monitor - online"
-echo "================================="
-echo "Description:"
-echo "run monitor server while already running."
-requiredstatus="ONLINE"
-fn_setstatus
-(fn_monitor)
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "5.2 - monitor - offline - no lockfile"
-echo "================================="
-echo "Description:"
-echo "run monitor while server is offline with no lockfile."
-requiredstatus="OFFLINE"
-fn_setstatus
-(fn_monitor)
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "5.3 - monitor - offline - with lockfile"
-echo "================================="
-echo "Description:"
-echo "run monitor while server is offline with no lockfile."
-requiredstatus="OFFLINE"
-fn_setstatus
-fn_printinfonl "creating lockfile."
-date > "${rootdir}/${lockselfname}"
-(fn_monitor)
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-echo "5.4 - monitor - gsquery.py failure"
-echo "================================="
-echo "Description:"
-echo "gsquery.py will fail to query port."
-requiredstatus="ONLINE"
-fn_setstatus
-sed -i 's/[0-9]\+/0/' "${servercfgfullpath}"
-fn_monitor
-echo ""
-fn_printinfonl "Reseting ${servercfg}."
-fn_install_config
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-
-
-
-echo "6.0 - details"
-echo "================================="
-echo "Description:"
-echo "gsquery.py will fail to query port."
-requiredstatus="ONLINE"
-fn_setstatus
-fn_details
-echo ""
-echo "Test complete!"
-sleep 1
-echo ""
-
-echo "================================="
-echo "Generic Server Tests - Complete!"
-echo "Using: ${gamename}"
-echo "================================="
-echo ""
-sleep 1
-fn_printinfo "Tidying up directories."
-sleep 1
-rm -rfv ${rootdir}
-echo "END"
-
-#!/bin/bash
-# Teamspeak 3
-# Server Management Script
-# Author: Daniel Gibbs
-# Website: http://gameservermanagers.com
-version="040715"
-
-#### Variables ####
-
-# Notification Email
-# (on|off)
-emailnotification="on"
-email="me@Danielgibbs.co.uk"
-
-# Start Variables
-updateonstart="off"
-
-# Server Details
-gamename="Teamspeak 3"
-servername="Teamspeak 3 Server"
-servicename="ts3-server"
-
-# Directories
-rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/ts3server"
-selfname="$(basename $0)"
-lockselfname=".${servicename}.lock"
-filesdir="${rootdir}/serverfiles"
-systemdir="${filesdir}"
-executabledir="${filesdir}"
-executable="./ts3server_startscript.sh"
-servercfg="${servicename}.ini"
-servercfgdir="${filesdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-backupdir="${rootdir}/backups"
-
-# Logging
-logdays="7"
-gamelogdir="${filesdir}/logs"
-scriptlogdir="${rootdir}/log/script"
-
-scriptlog="${scriptlogdir}/${servicename}-script.log"
-emaillog="${scriptlogdir}/${servicename}-email.log"
-
-scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log"
-
-
-echo "================================="
-echo "Generic Server Tests"
-echo "Using: ${gamename}"
-echo "================================="
-echo ""
-sleep 1
\ No newline at end of file
diff --git a/tests/test.sh b/tests/tests_jc2server.sh
similarity index 85%
rename from tests/test.sh
rename to tests/tests_jc2server.sh
index cbe7fdbaf..ae3f0498e 100644
--- a/tests/test.sh
+++ b/tests/tests_jc2server.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
-# Just Cause 2
+# TravisCI Tests
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-version="150715"
+
+version="011115"
 
 #### Variables ####
 
@@ -34,8 +35,7 @@ gamename="Just Cause 2"
 engine="avalanche"
 
 # Directories
-rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/jc2server"
-mkdir "${rootdir}"
+rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 selfname="$(basename $0)"
 lockselfname=".${servicename}.lock"
 filesdir="${rootdir}/serverfiles"
@@ -139,24 +139,34 @@ echo "================================="
 echo ""
 sleep 1
 echo "================================="
-echo "Generic Server Tests"
+echo "Server Tests"
 echo "Using: ${gamename}"
 echo "================================="
 echo ""
 sleep 1
 
 
+
 echo "1.0 - start - no files"
 echo "================================="
 echo "Description:"
-echo "Test script reaction to missing server files."
-requiredstatus="OFFLINE"
-fn_setstatus
+echo "test script reaction to missing server files."
+echo ""
 (fn_start)
 echo ""
 echo "Test complete!"
 sleep 1
 echo ""
+echo "1.1 - getopt"
+echo "================================="
+echo "Description:"
+echo "displaying options messages."
+echo ""
+(fn_getopt)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
 
 
 
@@ -164,8 +174,6 @@ echo "2.0 - install"
 echo "================================="
 echo "Description:"
 echo "install ${gamename} server."
-requiredstatus="OFFLINE"
-fn_setstatus
 fn_autoinstall
 echo ""
 echo "Test complete!"
@@ -200,7 +208,7 @@ echo "3.3 - start - updateonstart"
 echo "================================="
 echo "Description:"
 echo "will update server on start."
-requiredstatus="ONLINE"
+requiredstatus="OFFLINE"
 fn_setstatus
 (
 	updateonstart="on"
@@ -410,7 +418,7 @@ echo ""
 echo "6.0 - details"
 echo "================================="
 echo "Description:"
-echo "gsquery.py will fail to query port."
+echo "display details."
 requiredstatus="ONLINE"
 fn_setstatus
 fn_details
@@ -420,65 +428,13 @@ sleep 1
 echo ""
 
 echo "================================="
-echo "Generic Server Tests - Complete!"
+echo "Server Tests - Complete!"
 echo "Using: ${gamename}"
 echo "================================="
 echo ""
 sleep 1
 fn_printinfo "Tidying up directories."
 sleep 1
-rm -rfv ${rootdir}
+rm -rfv ${serverfiles}
 echo "END"
 
-#!/bin/bash
-# Teamspeak 3
-# Server Management Script
-# Author: Daniel Gibbs
-# Website: http://gameservermanagers.com
-version="040715"
-
-#### Variables ####
-
-# Notification Email
-# (on|off)
-emailnotification="on"
-email="me@Danielgibbs.co.uk"
-
-# Start Variables
-updateonstart="off"
-
-# Server Details
-gamename="Teamspeak 3"
-servername="Teamspeak 3 Server"
-servicename="ts3-server"
-
-# Directories
-rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/ts3server"
-selfname="$(basename $0)"
-lockselfname=".${servicename}.lock"
-filesdir="${rootdir}/serverfiles"
-systemdir="${filesdir}"
-executabledir="${filesdir}"
-executable="./ts3server_startscript.sh"
-servercfg="${servicename}.ini"
-servercfgdir="${filesdir}"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-backupdir="${rootdir}/backups"
-
-# Logging
-logdays="7"
-gamelogdir="${filesdir}/logs"
-scriptlogdir="${rootdir}/log/script"
-
-scriptlog="${scriptlogdir}/${servicename}-script.log"
-emaillog="${scriptlogdir}/${servicename}-email.log"
-
-scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log"
-
-
-echo "================================="
-echo "Generic Server Tests"
-echo "Using: ${gamename}"
-echo "================================="
-echo ""
-sleep 1
\ No newline at end of file

From 93d37dece010fcc8745394ef9b47c3f8db84a9c3 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Nov 2015 15:30:08 +0000
Subject: [PATCH 02/25] Added ts3server tests

---
 .travis.yml              |   3 +-
 tests/tests_jc2server.sh |  17 +-
 tests/tests_ts3server.sh | 347 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 359 insertions(+), 8 deletions(-)
 create mode 100644 tests/tests_ts3server.sh

diff --git a/.travis.yml b/.travis.yml
index 3594768d1..7a1c63dcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,5 @@ addons:
 
 script:
 
-    - bash tests/tests_jc2server.sh
\ No newline at end of file
+    - bash tests/tests_jc2server.sh
+    - bash tests/tests_ts3server.sh
\ No newline at end of file
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index ae3f0498e..89a808cd5 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -3,7 +3,6 @@
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-
 version="011115"
 
 #### Variables ####
@@ -88,11 +87,16 @@ fn_runfunction
 
 fn_functions
 
-getopt=$1
-
 fn_currentstatus(){
-pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
-if [ "${pid}" == "0" ]; then
+if [ "${gamename}" == "Teamspeak 3" ]; then
+	fn_check_ts3status
+	ts3status=$(${executable} status servercfgfullpathfile=${servercfgfullpath})
+else
+	pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+fi
+
+#echo "${ts3status}"
+if [ "${pid}" == "0" ]||[ "${ts3status}" != "Server is running" ]; then
 	currentstatus="OFFLINE"
 else
 	currentstatus="ONLINE"
@@ -436,5 +440,4 @@ sleep 1
 fn_printinfo "Tidying up directories."
 sleep 1
 rm -rfv ${serverfiles}
-echo "END"
-
+echo "END"
\ No newline at end of file
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
new file mode 100644
index 000000000..5d54b6ea2
--- /dev/null
+++ b/tests/tests_ts3server.sh
@@ -0,0 +1,347 @@
+#!/bin/bash
+# TravisCI Tests
+# Server Management Script
+# Author: Daniel Gibbs
+# Website: http://gameservermanagers.com
+version="011115"
+
+#### Variables ####
+
+# Notification Email
+# (on|off)
+emailnotification="on"
+email="me@danielgibbs.co.uk"
+
+# Start Variables
+updateonstart="off"
+
+# Server Details
+gamename="Teamspeak 3"
+servername="Teamspeak 3 Server"
+servicename="ts3-server"
+
+# Directories
+rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+selfname="$(basename $0)"
+lockselfname=".${servicename}.lock"
+filesdir="${rootdir}/serverfiles"
+systemdir="${filesdir}"
+executabledir="${filesdir}"
+executable="./ts3server_startscript.sh"
+servercfg="${servicename}.ini"
+servercfgdir="${filesdir}"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+backupdir="${rootdir}/backups"
+
+# Logging
+logdays="7"
+gamelogdir="${filesdir}/logs"
+scriptlogdir="${rootdir}/log/script"
+
+scriptlog="${scriptlogdir}/${servicename}-script.log"
+emaillog="${scriptlogdir}/${servicename}-email.log"
+
+scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log"
+
+##### Script #####
+# Do not edit
+
+fn_runfunction(){
+# Functions are downloaded and run with this function
+if [ ! -f "${rootdir}/functions/${functionfile}" ]; then
+	cd "${rootdir}"
+	if [ ! -d "functions" ]; then
+		mkdir functions
+	fi
+	cd functions
+	echo -e "    loading ${functionfile}...\c"
+	wget -N /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/functions/${functionfile} 2>&1 | grep -F HTTP | cut -c45-
+	chmod +x "${functionfile}"
+	cd "${rootdir}"
+fi
+source "${rootdir}/functions/${functionfile}"
+}
+
+fn_functions(){
+# Functions are defined in fn_functions.
+functionfile="${FUNCNAME}"
+fn_runfunction
+}
+
+fn_functions
+
+fn_currentstatus(){
+pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+fn_check_ts3status
+if [ "${pid}" == "0" ]||[ "${ts3status}" != "Server is running" ]; then
+	currentstatus="OFFLINE"
+else
+	currentstatus="ONLINE"
+fi
+}
+	
+fn_setstatus(){
+	fn_currentstatus
+	
+	echo""
+	echo "Required status: ${requiredstatus}"
+	counter=0
+    while [  "${requiredstatus}" != "${currentstatus}" ]; do
+    	counter=$((counter+1))
+    	fn_currentstatus
+	
+    	echo -ne "Current status:  ${currentstatus}\\r"
+		if [ "${requiredstatus}" == "ONLINE" ]; then
+			(fn_start > /dev/null 2>&1)
+		else
+			(fn_stop > /dev/null 2>&1)
+		fi
+    	if [ "${counter}" -gt "5" ]; then
+    		currentstatus="FAIL"
+    		echo "Current status:  ${currentstatus}"
+    		echo ""
+    		echo "Unable to start or stop server."
+    		exit
+    	fi
+    done
+    echo -ne "Current status:  ${currentstatus}\\r"
+    echo -e "\n"
+    echo "Test starting:"
+    echo ""
+    sleep 0.5
+}
+
+echo "================================="
+echo "TravisCI Tests"
+echo "Linux Game Server Manager"
+echo "by Daniel Gibbs"
+echo "http://gameservermanagers.com"
+echo "================================="
+echo ""
+sleep 1
+echo "================================="
+echo "Server Tests"
+echo "Using: ${gamename}"
+echo "================================="
+echo ""
+sleep 1
+
+
+
+echo "1.0 - start - no files"
+echo "================================="
+echo "Description:"
+echo "test script reaction to missing server files."
+echo ""
+(fn_start)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "1.1 - getopt"
+echo "================================="
+echo "Description:"
+echo "displaying options messages."
+echo ""
+(fn_getopt)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+
+
+
+echo "2.0 - install"
+echo "================================="
+echo "Description:"
+echo "install ${gamename} server."
+fn_autoinstall
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+
+
+
+echo "3.1 - start"
+echo "================================="
+echo "Description:"
+echo "start ${gamename} server."
+requiredstatus="OFFLINE"
+fn_setstatus
+fn_start
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "3.2 - start - online"
+echo "================================="
+echo "Description:"
+echo "start ${gamename} server while already running."
+requiredstatus="ONLINE"
+fn_setstatus
+(fn_start)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "3.3 - start - updateonstart"
+echo "================================="
+echo "Description:"
+echo "will update server on start."
+requiredstatus="OFFLINE"
+fn_setstatus
+(
+	updateonstart="on"
+	fn_start
+)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "3.4 - stop"
+echo "================================="
+echo "Description:"
+echo "stop ${gamename} server."
+requiredstatus="ONLINE"
+fn_setstatus
+fn_stop
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "3.5 - stop - offline"
+echo "================================="
+echo "Description:"
+echo "stop ${gamename} server while already stopped."
+requiredstatus="OFFLINE"
+fn_setstatus
+(fn_stop)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "3.6 - restart"
+echo "================================="
+echo "Description:"
+echo "restart ${gamename}."
+requiredstatus="ONLINE"
+fn_setstatus
+fn_restart
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "3.7 - restart - offline"
+echo "================================="
+echo "Description:"
+echo "restart ${gamename} while already stopped."
+requiredstatus="OFFLINE"
+fn_setstatus
+fn_restart
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+
+
+
+echo "4.1 - update"
+echo "================================="
+echo "Description:"
+echo "check for updates."
+requiredstatus="OFFLINE"
+fn_setstatus
+fn_update_check
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "4.1 - update - old version"
+echo "================================="
+echo "Description:"
+echo "change the version number tricking LGSM to update."
+requiredstatus="OFFLINE"
+sed -i 's/[0-9]\+/0/g' ${gamelogdir}/ts3server*_0.log
+fn_setstatus
+fn_update_check
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+
+echo "5.1 - monitor - online"
+echo "================================="
+echo "Description:"
+echo "run monitor server while already running."
+requiredstatus="ONLINE"
+fn_setstatus
+(fn_monitor)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "5.2 - monitor - offline - no lockfile"
+echo "================================="
+echo "Description:"
+echo "run monitor while server is offline with no lockfile."
+requiredstatus="OFFLINE"
+fn_setstatus
+(fn_monitor)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "5.3 - monitor - offline - with lockfile"
+echo "================================="
+echo "Description:"
+echo "run monitor while server is offline with no lockfile."
+requiredstatus="OFFLINE"
+fn_setstatus
+fn_printinfonl "creating lockfile."
+date > "${rootdir}/${lockselfname}"
+(fn_monitor)
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+echo "5.4 - monitor - gsquery.py failure"
+echo "================================="
+echo "Description:"
+echo "gsquery.py will fail to query port."
+requiredstatus="ONLINE"
+fn_setstatus
+sed -i 's/[0-9]\+/0/' "${servercfgfullpath}"
+(fn_monitor)
+echo ""
+fn_printinfonl "Reseting ${servercfg}."
+fn_install_config
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+
+
+
+echo "6.0 - details"
+echo "================================="
+echo "Description:"
+echo "display details."
+requiredstatus="ONLINE"
+fn_setstatus
+fn_details
+echo ""
+echo "Test complete!"
+sleep 1
+echo ""
+
+echo "================================="
+echo "Server Tests - Complete!"
+echo "Using: ${gamename}"
+echo "================================="
+echo ""
+sleep 1
+fn_printinfo "Tidying up directories."
+sleep 1
+rm -rfv ${serverfiles}
+echo "END"
\ No newline at end of file

From 00251dbe07d3b3705a3f3f1179a6f93ab8175e6c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Nov 2015 15:39:10 +0000
Subject: [PATCH 03/25] exit 1

---
 tests/tests_jc2server.sh | 2 +-
 tests/tests_ts3server.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 89a808cd5..b279207c6 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -124,7 +124,7 @@ fn_setstatus(){
     		echo "Current status:  ${currentstatus}"
     		echo ""
     		echo "Unable to start or stop server."
-    		exit
+    		exit 1
     	fi
     done
     echo -ne "Current status:  ${currentstatus}\\r"
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 5d54b6ea2..46a9fd275 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -101,7 +101,7 @@ fn_setstatus(){
     		echo "Current status:  ${currentstatus}"
     		echo ""
     		echo "Unable to start or stop server."
-    		exit
+    		exit 1
     	fi
     done
     echo -ne "Current status:  ${currentstatus}\\r"

From c4a43f8ccd481ba98748a564fbed3e859c7963b1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Nov 2015 16:58:20 +0000
Subject: [PATCH 04/25] added exit

---
 functions/fn_start | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/functions/fn_start b/functions/fn_start
index 66d9ae355..89c3a0a13 100644
--- a/functions/fn_start
+++ b/functions/fn_start
@@ -63,6 +63,7 @@ if [ "${ts3status}" = "Server seems to have died" ] || [ "${ts3status}"	= "No se
 	fn_printfailnl "Unable to start ${servername}"
 	fn_scriptlog "Unable to start ${servername}"
 	echo -e "	Check log files: ${rootdir}/log"
+	exit 1
 else
 	fn_printok "${servername}"
 	fn_scriptlog "Started ${servername}"
@@ -188,6 +189,7 @@ if [ "${tmuxwc}" -eq 0 ]; then
 			fi
 		fi
 	fi
+exit 1	
 else
 	fn_printok "${servername}"
 	fn_scriptlog "Started ${servername}"

From 18367c764667fd5dc8cadca33288fcc7938fa851 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:00:55 +0000
Subject: [PATCH 05/25] Altered how current status is displayed

---
 tests/tests_jc2server.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index b6d4dbec3..43cf42976 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -109,11 +109,12 @@ fn_setstatus(){
 	echo""
 	echo "Required status: ${requiredstatus}"
 	counter=0
+	echo "Current status:  ${currentstatus}"
     while [  "${requiredstatus}" != "${currentstatus}" ]; do
     	counter=$((counter+1))
     	fn_currentstatus
-	
-    	echo -ne "Current status:  ${currentstatus}\\r"
+		echo -ne "New status:  ${currentstatus}\\r"
+    	
 		if [ "${requiredstatus}" == "ONLINE" ]; then
 			(fn_start > /dev/null 2>&1)
 		else

From ef7f4d16b5446764aafbd6e381bb0b3e3d717116 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:02:35 +0000
Subject: [PATCH 06/25] fixed rootdir

---
 tests/tests_jc2server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 43cf42976..2af7f92f8 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -149,7 +149,7 @@ echo "Using: ${gamename}"
 echo "================================="
 echo ""
 sleep 1
-mkdir ${rootfdir}
+mkdir ${rootdir}
 
 
 

From 429239e06233e898bdac7e82971f864218dbb4c0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:06:49 +0000
Subject: [PATCH 07/25] removed devnull to see output

---
 tests/tests_jc2server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 2af7f92f8..1a726873f 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -116,7 +116,7 @@ fn_setstatus(){
 		echo -ne "New status:  ${currentstatus}\\r"
     	
 		if [ "${requiredstatus}" == "ONLINE" ]; then
-			(fn_start > /dev/null 2>&1)
+			(fn_start)
 		else
 			(fn_stop > /dev/null 2>&1)
 		fi

From fc1ee4f130d0d489eaee4425b4f5d1a868342990 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:13:08 +0000
Subject: [PATCH 08/25] added pid=

---
 tests/tests_jc2server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 1a726873f..6f52fdff8 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -95,7 +95,7 @@ else
 	pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
 fi
 
-#echo "${ts3status}"
+pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
 if [ "${pid}" == "0" ]||[ "${ts3status}" != "Server is running" ]; then
 	currentstatus="OFFLINE"
 else

From 263b413e81c9ebebfddc76c47df08ae8789351c0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:18:54 +0000
Subject: [PATCH 09/25] compare

---
 tests/tests_jc2server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 6f52fdff8..f76c7007b 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -113,6 +113,7 @@ 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

From 7ef53c9bf372d8c8840a0db8a06f5599379960cc Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:22:09 +0000
Subject: [PATCH 10/25] added pid echo

---
 tests/tests_jc2server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index f76c7007b..8226d179f 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -96,6 +96,7 @@ else
 fi
 
 pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+echo "PID: ${pid}"
 if [ "${pid}" == "0" ]||[ "${ts3status}" != "Server is running" ]; then
 	currentstatus="OFFLINE"
 else

From 02646320cd4d96dd32f700c4799e420d80798447 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:25:15 +0000
Subject: [PATCH 11/25] removed ts3status if

---
 tests/tests_jc2server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 8226d179f..8cca5ecba 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -97,7 +97,7 @@ fi
 
 pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
 echo "PID: ${pid}"
-if [ "${pid}" == "0" ]||[ "${ts3status}" != "Server is running" ]; then
+if [ "${pid}" == "0" ]; then
 	currentstatus="OFFLINE"
 else
 	currentstatus="ONLINE"

From 826843bdcaf475755d4846e44e858ff346c54213 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:30:25 +0000
Subject: [PATCH 12/25] 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

From 776a6564a69f06a624a9936440c8c0f85fa578c7 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:31:20 +0000
Subject: [PATCH 13/25] changed to new

---
 tests/tests_jc2server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 7922ac6c1..2b4ef294f 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -127,7 +127,7 @@ fn_setstatus(){
     		exit 1
     	fi
     done
-    echo -ne "Current status:  ${currentstatus}\\r"
+    echo -ne "New status:  ${currentstatus}\\r"
     echo -e "\n"
     echo "Test starting:"
     echo ""

From 658edb2e0811bf61f5d4b2597cfb2b0afbd670f6 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:42:19 +0000
Subject: [PATCH 14/25] testing bash linter

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..94f2ae69a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "build"]
+	path = build
+	url = https://github.com/caarlos0/shell-ci-build.git

From 02789fcb289531abba743243bc6d267610f15dfb Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:42:30 +0000
Subject: [PATCH 15/25] testing bash linter

---
 .travis.yml                 |  7 +++-
 build/.shippable.yml        |  8 ++++
 build/.travis.yml           |  8 ++++
 build/LICENSE               | 22 +++++++++++
 build/README.md             | 75 +++++++++++++++++++++++++++++++++++++
 build/build.sh              | 45 ++++++++++++++++++++++
 build/install.sh            | 10 +++++
 build/shippable.yml.example |  8 ++++
 build/tests/bash.sh         |  2 +
 build/tests/ksh.sh          |  2 +
 build/tests/sh.sh           |  2 +
 build/tests/zsh.sh          |  2 +
 build/travis.yml.example    |  8 ++++
 13 files changed, 197 insertions(+), 2 deletions(-)
 create mode 100644 build/.shippable.yml
 create mode 100644 build/.travis.yml
 create mode 100644 build/LICENSE
 create mode 100644 build/README.md
 create mode 100644 build/build.sh
 create mode 100644 build/install.sh
 create mode 100644 build/shippable.yml.example
 create mode 100644 build/tests/bash.sh
 create mode 100644 build/tests/ksh.sh
 create mode 100644 build/tests/sh.sh
 create mode 100644 build/tests/zsh.sh
 create mode 100644 build/travis.yml.example

diff --git a/.travis.yml b/.travis.yml
index 7a1c63dcf..95aeadcb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,10 @@ addons:
     - telnet 
     - expect
 
-script:
+install:
+  	- ./build/install.sh
 
+script:
+  	- ./build/build.sh
     - bash tests/tests_jc2server.sh
-    - bash tests/tests_ts3server.sh
\ No newline at end of file
+    - bash tests/tests_ts3server.sh
diff --git a/build/.shippable.yml b/build/.shippable.yml
new file mode 100644
index 000000000..421daea86
--- /dev/null
+++ b/build/.shippable.yml
@@ -0,0 +1,8 @@
+language: ruby
+install:
+  - ./install.sh
+script:
+  - ./build.sh
+notifications:
+  email: false
+sudo: required
diff --git a/build/.travis.yml b/build/.travis.yml
new file mode 100644
index 000000000..17f4c2c4f
--- /dev/null
+++ b/build/.travis.yml
@@ -0,0 +1,8 @@
+language: bash
+install:
+  - ./install.sh
+script:
+  - ./build.sh
+notifications:
+  email: false
+sudo: required
diff --git a/build/LICENSE b/build/LICENSE
new file mode 100644
index 000000000..47ef4160e
--- /dev/null
+++ b/build/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Carlos Alexandro Becker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/build/README.md b/build/README.md
new file mode 100644
index 000000000..9467a3c10
--- /dev/null
+++ b/build/README.md
@@ -0,0 +1,75 @@
+shell-ci-build [![Build Status](https://travis-ci.org/caarlos0/shell-ci-build.svg?branch=master)](https://travis-ci.org/caarlos0/shell-ci-build)
+==================
+
+A submodule to lint your shell projects with shellcheck in travis.ci builds.
+
+## Build
+
+- The `install.sh` script will install shellckeck.
+- The `build.sh` will lint all executable files with shellcheck, avoiding
+Ruby, compdef and the like files. It will also ignore all files inside `.git`
+directory and files of your `gitmodules`, if any.
+
+## Usage
+
+```sh
+git submodule add https://github.com/caarlos0/shell-ci-build.git build
+cp build/travis.yml.example .travis.yml
+```
+
+We also support Shippable:
+
+```
+cp build/shippable.yml.example .shippable.yml
+```
+
+Or tweak your `.travis.yml` to be like this:
+
+```yml
+language: bash
+install:
+  - ./build/install.sh
+script:
+  - ./build/build.sh
+```
+
+## Customizing
+
+You might want to lint other files, to do that, you need your own
+`build.sh` and a slight change in `.travis.yml` file.
+
+Example (from  my [dotfiles](https://github.com/caarlos0/dotfiles)):
+
+```sh
+#!/usr/bin/env bash
+set -eo pipefail
+source ./build/build.sh
+check "./zsh/zshrc.symlink"
+```
+
+```yml
+language: bash
+install:
+  - ./build/install.sh
+script:
+  - ./build.sh
+notifications:
+  email: false
+```
+
+This will make travis ran the `build.sh` from this project first,
+then, lint your custom files.
+
+You can also override the `find_cmd` function, which returns a string
+containing the `find` command to `eval`. Check the source or open an
+issue if you have any problems.
+
+## Updating
+
+Update your projects is easy. Just run this:
+
+```sh
+git submodule update --remote --merge && \
+  git commit -am 'updated shell-ci-build version' && \
+  git push
+```
diff --git a/build/build.sh b/build/build.sh
new file mode 100644
index 000000000..5043a35b7
--- /dev/null
+++ b/build/build.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ "${DEBUG:-}" ]] && set -x
+
+success() {
+  printf "\r\033[2K  [ \033[00;32mOK\033[0m ] Linting %s...\n" "$1"
+}
+
+fail() {
+  printf "\r\033[2K  [\033[0;31mFAIL\033[0m] Linting %s...\n" "$1"
+  exit 1
+}
+
+check() {
+  local script="$1"
+  shellcheck "$script" || fail "$script"
+  success "$script"
+}
+
+find_prunes() {
+  local prunes="! -path './.git/*'"
+  if [ -f .gitmodules ]; then
+    while read module; do
+      prunes="$prunes ! -path './$module/*'"
+    done < <(grep path .gitmodules | awk '{print $3}')
+  fi
+  echo "$prunes"
+}
+
+find_cmd() {
+  echo "find . -type f -and \( -perm +111 -or -name '*.sh' \) $(find_prunes)"
+}
+
+check_all_executables() {
+  echo "Linting all executables and .sh files, ignoring files inside git modules..."
+  eval "$(find_cmd)" | while read script; do
+    head=$(head -n1 "$script")
+    [[ "$head" =~ .*ruby.* ]] && continue
+    [[ "$head" =~ .*zsh.* ]] && continue
+    [[ "$head" =~ ^#compdef.* ]] && continue
+    check "$script"
+  done
+}
+
+check_all_executables
diff --git a/build/install.sh b/build/install.sh
new file mode 100644
index 000000000..c66b56c59
--- /dev/null
+++ b/build/install.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eo pipefail
+
+main() {
+  local filename="shellcheck_0.3.7-1_amd64.deb"
+  wget "http://ftp.debian.org/debian/pool/main/s/shellcheck/$filename"
+  sudo dpkg -i "$filename"
+}
+
+main
diff --git a/build/shippable.yml.example b/build/shippable.yml.example
new file mode 100644
index 000000000..c2f36c044
--- /dev/null
+++ b/build/shippable.yml.example
@@ -0,0 +1,8 @@
+language: ruby
+install:
+  - ./build/install.sh
+script:
+  - ./build/build.sh
+notifications:
+  email: false
+sudo: required
diff --git a/build/tests/bash.sh b/build/tests/bash.sh
new file mode 100644
index 000000000..8de506c94
--- /dev/null
+++ b/build/tests/bash.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "hi"
diff --git a/build/tests/ksh.sh b/build/tests/ksh.sh
new file mode 100644
index 000000000..c0db8626f
--- /dev/null
+++ b/build/tests/ksh.sh
@@ -0,0 +1,2 @@
+#!/bin/ksh
+echo "hi"
diff --git a/build/tests/sh.sh b/build/tests/sh.sh
new file mode 100644
index 000000000..279508d8e
--- /dev/null
+++ b/build/tests/sh.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "hi"
diff --git a/build/tests/zsh.sh b/build/tests/zsh.sh
new file mode 100644
index 000000000..0fe81dfa7
--- /dev/null
+++ b/build/tests/zsh.sh
@@ -0,0 +1,2 @@
+#!/bin/zsh
+echo "hi"
diff --git a/build/travis.yml.example b/build/travis.yml.example
new file mode 100644
index 000000000..3f7a7173a
--- /dev/null
+++ b/build/travis.yml.example
@@ -0,0 +1,8 @@
+language: bash
+install:
+  - ./build/install.sh
+script:
+  - ./build/build.sh
+notifications:
+  email: false
+sudo: required

From 85f53376e31249855bef6d3036df524462564b29 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:43:30 +0000
Subject: [PATCH 16/25] bug

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 95aeadcb3..c2f65e80f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ addons:
     - expect
 
 install:
-  	- ./build/install.sh
+    - ./build/install.sh
 
 script:
   	- ./build/build.sh

From dfec4dd2d76b31f46e6e33959b871785cafaff4f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:44:33 +0000
Subject: [PATCH 17/25] another bug

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c2f65e80f..038ece78a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,9 +21,9 @@ addons:
     - expect
 
 install:
-    - ./build/install.sh
+    - bash build/install.sh
 
 script:
-  	- ./build/build.sh
+  	- bash build/build.sh
     - bash tests/tests_jc2server.sh
     - bash tests/tests_ts3server.sh

From f21cbd472bba2c32592d14127bea7c244f447acd Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:45:20 +0000
Subject: [PATCH 18/25] used default

---
 .travis.yml | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 038ece78a..3944fb593 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,7 @@
 language: bash
-sudo: false
-env:
-- DISTRO=ubuntu-trusty
-
-before_script:
-    - curl -L "https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz" | tar zx
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - tmux
-    - mailutils
-    - postfix 
-    - lib32gcc1 
-    - libstdc++6 
-    - libstdc++6:i386 
-    - telnet 
-    - expect
-
 install:
-    - bash build/install.sh
-
+  - ./build/install.sh
 script:
-  	- bash build/build.sh
-    - bash tests/tests_jc2server.sh
-    - bash tests/tests_ts3server.sh
+  - ./build.sh
+notifications:
+  email: false
\ No newline at end of file

From bef7f221488c4c990f8a806c5545ec81fe6b9994 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:46:39 +0000
Subject: [PATCH 19/25] Reverting to original ready for merge

---
 .travis.yml | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3944fb593..7a1c63dcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,26 @@
 language: bash
-install:
-  - ./build/install.sh
+sudo: false
+env:
+- DISTRO=ubuntu-trusty
+
+before_script:
+    - curl -L "https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz" | tar zx
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - tmux
+    - mailutils
+    - postfix 
+    - lib32gcc1 
+    - libstdc++6 
+    - libstdc++6:i386 
+    - telnet 
+    - expect
+
 script:
-  - ./build.sh
-notifications:
-  email: false
\ No newline at end of file
+
+    - bash tests/tests_jc2server.sh
+    - bash tests/tests_ts3server.sh
\ No newline at end of file

From bd08a45e8f58ba85f1615719b90c0e41f63f7e11 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:56:07 +0000
Subject: [PATCH 20/25] updated for ts3 tests as well

---
 tests/tests_ts3server.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 46a9fd275..ea26ea22e 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -71,12 +71,17 @@ fn_runfunction
 fn_functions
 
 fn_currentstatus(){
-pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
-fn_check_ts3status
-if [ "${pid}" == "0" ]||[ "${ts3status}" != "Server is running" ]; then
-	currentstatus="OFFLINE"
+if [ "${gamename}" == "Teamspeak 3" ]; then
+	fn_check_ts3status
+	ts3status=$(${executable} status servercfgfullpathfile=${servercfgfullpath})
 else
+	pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+fi
+
+if [ "${pid}" != "0" ]||[ "${ts3status}" == "Server is running" ]; then
 	currentstatus="ONLINE"
+else
+	currentstatus="OFFLINE"	
 fi
 }
 	
@@ -86,11 +91,12 @@ fn_setstatus(){
 	echo""
 	echo "Required status: ${requiredstatus}"
 	counter=0
+	echo "Current status:  ${currentstatus}"
     while [  "${requiredstatus}" != "${currentstatus}" ]; do
     	counter=$((counter+1))
     	fn_currentstatus
-	
-    	echo -ne "Current status:  ${currentstatus}\\r"
+		echo -ne "New status:  ${currentstatus}\\r"
+    	
 		if [ "${requiredstatus}" == "ONLINE" ]; then
 			(fn_start > /dev/null 2>&1)
 		else
@@ -104,7 +110,7 @@ fn_setstatus(){
     		exit 1
     	fi
     done
-    echo -ne "Current status:  ${currentstatus}\\r"
+    echo -ne "New status:  ${currentstatus}\\r"
     echo -e "\n"
     echo "Test starting:"
     echo ""

From f5458419ab4540dafe9279ecc4618611bba0a3dc Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 15:57:28 +0000
Subject: [PATCH 21/25] Removed gitlint code for now

---
 .gitmodules                 |  3 --
 build/.shippable.yml        |  8 ----
 build/.travis.yml           |  8 ----
 build/LICENSE               | 22 -----------
 build/README.md             | 75 -------------------------------------
 build/build.sh              | 45 ----------------------
 build/install.sh            | 10 -----
 build/shippable.yml.example |  8 ----
 build/tests/bash.sh         |  2 -
 build/tests/ksh.sh          |  2 -
 build/tests/sh.sh           |  2 -
 build/tests/zsh.sh          |  2 -
 build/travis.yml.example    |  8 ----
 13 files changed, 195 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100644 build/.shippable.yml
 delete mode 100644 build/.travis.yml
 delete mode 100644 build/LICENSE
 delete mode 100644 build/README.md
 delete mode 100644 build/build.sh
 delete mode 100644 build/install.sh
 delete mode 100644 build/shippable.yml.example
 delete mode 100644 build/tests/bash.sh
 delete mode 100644 build/tests/ksh.sh
 delete mode 100644 build/tests/sh.sh
 delete mode 100644 build/tests/zsh.sh
 delete mode 100644 build/travis.yml.example

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 94f2ae69a..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "build"]
-	path = build
-	url = https://github.com/caarlos0/shell-ci-build.git
diff --git a/build/.shippable.yml b/build/.shippable.yml
deleted file mode 100644
index 421daea86..000000000
--- a/build/.shippable.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: ruby
-install:
-  - ./install.sh
-script:
-  - ./build.sh
-notifications:
-  email: false
-sudo: required
diff --git a/build/.travis.yml b/build/.travis.yml
deleted file mode 100644
index 17f4c2c4f..000000000
--- a/build/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: bash
-install:
-  - ./install.sh
-script:
-  - ./build.sh
-notifications:
-  email: false
-sudo: required
diff --git a/build/LICENSE b/build/LICENSE
deleted file mode 100644
index 47ef4160e..000000000
--- a/build/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Carlos Alexandro Becker
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/build/README.md b/build/README.md
deleted file mode 100644
index 9467a3c10..000000000
--- a/build/README.md
+++ /dev/null
@@ -1,75 +0,0 @@
-shell-ci-build [![Build Status](https://travis-ci.org/caarlos0/shell-ci-build.svg?branch=master)](https://travis-ci.org/caarlos0/shell-ci-build)
-==================
-
-A submodule to lint your shell projects with shellcheck in travis.ci builds.
-
-## Build
-
-- The `install.sh` script will install shellckeck.
-- The `build.sh` will lint all executable files with shellcheck, avoiding
-Ruby, compdef and the like files. It will also ignore all files inside `.git`
-directory and files of your `gitmodules`, if any.
-
-## Usage
-
-```sh
-git submodule add https://github.com/caarlos0/shell-ci-build.git build
-cp build/travis.yml.example .travis.yml
-```
-
-We also support Shippable:
-
-```
-cp build/shippable.yml.example .shippable.yml
-```
-
-Or tweak your `.travis.yml` to be like this:
-
-```yml
-language: bash
-install:
-  - ./build/install.sh
-script:
-  - ./build/build.sh
-```
-
-## Customizing
-
-You might want to lint other files, to do that, you need your own
-`build.sh` and a slight change in `.travis.yml` file.
-
-Example (from  my [dotfiles](https://github.com/caarlos0/dotfiles)):
-
-```sh
-#!/usr/bin/env bash
-set -eo pipefail
-source ./build/build.sh
-check "./zsh/zshrc.symlink"
-```
-
-```yml
-language: bash
-install:
-  - ./build/install.sh
-script:
-  - ./build.sh
-notifications:
-  email: false
-```
-
-This will make travis ran the `build.sh` from this project first,
-then, lint your custom files.
-
-You can also override the `find_cmd` function, which returns a string
-containing the `find` command to `eval`. Check the source or open an
-issue if you have any problems.
-
-## Updating
-
-Update your projects is easy. Just run this:
-
-```sh
-git submodule update --remote --merge && \
-  git commit -am 'updated shell-ci-build version' && \
-  git push
-```
diff --git a/build/build.sh b/build/build.sh
deleted file mode 100644
index 5043a35b7..000000000
--- a/build/build.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-[[ "${DEBUG:-}" ]] && set -x
-
-success() {
-  printf "\r\033[2K  [ \033[00;32mOK\033[0m ] Linting %s...\n" "$1"
-}
-
-fail() {
-  printf "\r\033[2K  [\033[0;31mFAIL\033[0m] Linting %s...\n" "$1"
-  exit 1
-}
-
-check() {
-  local script="$1"
-  shellcheck "$script" || fail "$script"
-  success "$script"
-}
-
-find_prunes() {
-  local prunes="! -path './.git/*'"
-  if [ -f .gitmodules ]; then
-    while read module; do
-      prunes="$prunes ! -path './$module/*'"
-    done < <(grep path .gitmodules | awk '{print $3}')
-  fi
-  echo "$prunes"
-}
-
-find_cmd() {
-  echo "find . -type f -and \( -perm +111 -or -name '*.sh' \) $(find_prunes)"
-}
-
-check_all_executables() {
-  echo "Linting all executables and .sh files, ignoring files inside git modules..."
-  eval "$(find_cmd)" | while read script; do
-    head=$(head -n1 "$script")
-    [[ "$head" =~ .*ruby.* ]] && continue
-    [[ "$head" =~ .*zsh.* ]] && continue
-    [[ "$head" =~ ^#compdef.* ]] && continue
-    check "$script"
-  done
-}
-
-check_all_executables
diff --git a/build/install.sh b/build/install.sh
deleted file mode 100644
index c66b56c59..000000000
--- a/build/install.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -eo pipefail
-
-main() {
-  local filename="shellcheck_0.3.7-1_amd64.deb"
-  wget "http://ftp.debian.org/debian/pool/main/s/shellcheck/$filename"
-  sudo dpkg -i "$filename"
-}
-
-main
diff --git a/build/shippable.yml.example b/build/shippable.yml.example
deleted file mode 100644
index c2f36c044..000000000
--- a/build/shippable.yml.example
+++ /dev/null
@@ -1,8 +0,0 @@
-language: ruby
-install:
-  - ./build/install.sh
-script:
-  - ./build/build.sh
-notifications:
-  email: false
-sudo: required
diff --git a/build/tests/bash.sh b/build/tests/bash.sh
deleted file mode 100644
index 8de506c94..000000000
--- a/build/tests/bash.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "hi"
diff --git a/build/tests/ksh.sh b/build/tests/ksh.sh
deleted file mode 100644
index c0db8626f..000000000
--- a/build/tests/ksh.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/ksh
-echo "hi"
diff --git a/build/tests/sh.sh b/build/tests/sh.sh
deleted file mode 100644
index 279508d8e..000000000
--- a/build/tests/sh.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "hi"
diff --git a/build/tests/zsh.sh b/build/tests/zsh.sh
deleted file mode 100644
index 0fe81dfa7..000000000
--- a/build/tests/zsh.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/zsh
-echo "hi"
diff --git a/build/travis.yml.example b/build/travis.yml.example
deleted file mode 100644
index 3f7a7173a..000000000
--- a/build/travis.yml.example
+++ /dev/null
@@ -1,8 +0,0 @@
-language: bash
-install:
-  - ./build/install.sh
-script:
-  - ./build/build.sh
-notifications:
-  email: false
-sudo: required

From 0f9562a4fb1c5c8ec50bb460e3cf68060217181a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 16:13:33 +0000
Subject: [PATCH 22/25] Kill jc2server at end

---
 tests/tests_jc2server.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 2b4ef294f..305664921 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -437,6 +437,8 @@ echo "Server Tests - Complete!"
 echo "Using: ${gamename}"
 echo "================================="
 echo ""
+requiredstatus="OFFLINE"
+fn_setstatus
 sleep 1
 fn_printinfo "Tidying up directories."
 sleep 1

From 91998aa662845397648218bf18d9cf1050b6b3ed Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 16:13:43 +0000
Subject: [PATCH 23/25] tests

---
 tests/tests_ts3server.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index ea26ea22e..756a9770e 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -77,7 +77,7 @@ if [ "${gamename}" == "Teamspeak 3" ]; then
 else
 	pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
 fi
-
+echo "TS3STATUS: ${ts3status}"
 if [ "${pid}" != "0" ]||[ "${ts3status}" == "Server is running" ]; then
 	currentstatus="ONLINE"
 else
@@ -98,9 +98,9 @@ fn_setstatus(){
 		echo -ne "New status:  ${currentstatus}\\r"
     	
 		if [ "${requiredstatus}" == "ONLINE" ]; then
-			(fn_start > /dev/null 2>&1)
+			(fn_start)
 		else
-			(fn_stop > /dev/null 2>&1)
+			(fn_stop)
 		fi
     	if [ "${counter}" -gt "5" ]; then
     		currentstatus="FAIL"

From 660480187a68d5db5cc4100172387a4b7631d0ad Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 16:26:13 +0000
Subject: [PATCH 24/25] seporated tmux and ts3 code

---
 tests/tests_ts3server.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 756a9770e..1468ca4db 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -70,15 +70,19 @@ fn_runfunction
 
 fn_functions
 
-fn_currentstatus(){
-if [ "${gamename}" == "Teamspeak 3" ]; then
-	fn_check_ts3status
-	ts3status=$(${executable} status servercfgfullpathfile=${servercfgfullpath})
+fn_currentstatus_tmux(){
+pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+if [ "${pid}" != "0" ]; then
+	currentstatus="ONLINE"
 else
-	pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+	currentstatus="OFFLINE"	
 fi
-echo "TS3STATUS: ${ts3status}"
-if [ "${pid}" != "0" ]||[ "${ts3status}" == "Server is running" ]; then
+}
+
+fn_currentstatus_ts3(){
+ts3status=$(${executable} status servercfgfullpathfile=${servercfgfullpath})
+
+if [ "${ts3status}" == "Server is running" ]; then
 	currentstatus="ONLINE"
 else
 	currentstatus="OFFLINE"	
@@ -86,15 +90,14 @@ fi
 }
 	
 fn_setstatus(){
-	fn_currentstatus
-	
+	fn_currentstatus_ts3
 	echo""
 	echo "Required status: ${requiredstatus}"
 	counter=0
 	echo "Current status:  ${currentstatus}"
     while [  "${requiredstatus}" != "${currentstatus}" ]; do
     	counter=$((counter+1))
-    	fn_currentstatus
+    	fn_currentstatus_ts3
 		echo -ne "New status:  ${currentstatus}\\r"
     	
 		if [ "${requiredstatus}" == "ONLINE" ]; then

From 91bd2749d8ba0f453c36505158610ab7cb8540e8 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 7 Nov 2015 16:45:33 +0000
Subject: [PATCH 25/25] Final updates

---
 tests/tests_jc2server.sh | 23 +++++++++++++----------
 tests/tests_ts3server.sh |  4 +++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 305664921..17cffea23 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -3,7 +3,7 @@
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-version="011115"
+version="071115"
 
 #### Variables ####
 
@@ -87,15 +87,19 @@ fn_runfunction
 
 fn_functions
 
-fn_currentstatus(){
-if [ "${gamename}" == "Teamspeak 3" ]; then
-	fn_check_ts3status
-	ts3status=$(${executable} status servercfgfullpathfile=${servercfgfullpath})
+fn_currentstatus_tmux(){
+pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+if [ "${pid}" != "0" ]; then
+	currentstatus="ONLINE"
 else
-	pid=$(tmux list-sessions 2>&1 | awk '{print $1}' | grep -Ec "^${servicename}:")
+	currentstatus="OFFLINE"	
 fi
+}
 
-if [ "${pid}" != "0" ]||[ "${ts3status}" == "Server is running" ]; then
+fn_currentstatus_ts3(){
+ts3status=$(${executable} status servercfgfullpathfile=${servercfgfullpath})
+
+if [ "${ts3status}" == "Server is running" ]; then
 	currentstatus="ONLINE"
 else
 	currentstatus="OFFLINE"	
@@ -103,15 +107,14 @@ fi
 }
 	
 fn_setstatus(){
-	fn_currentstatus
-	
+	fn_currentstatus_tmux
 	echo""
 	echo "Required status: ${requiredstatus}"
 	counter=0
 	echo "Current status:  ${currentstatus}"
     while [  "${requiredstatus}" != "${currentstatus}" ]; do
     	counter=$((counter+1))
-    	fn_currentstatus
+    	fn_currentstatus_tmux
 		echo -ne "New status:  ${currentstatus}\\r"
     	
 		if [ "${requiredstatus}" == "ONLINE" ]; then
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 1468ca4db..3687a6d12 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -3,7 +3,7 @@
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-version="011115"
+version="071115"
 
 #### Variables ####
 
@@ -349,6 +349,8 @@ echo "Server Tests - Complete!"
 echo "Using: ${gamename}"
 echo "================================="
 echo ""
+requiredstatus="OFFLINE"
+fn_setstatus
 sleep 1
 fn_printinfo "Tidying up directories."
 sleep 1