From c3ee79e10b9357129637f4b830e443b91af45130 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 15 Mar 2018 19:51:52 +0000
Subject: [PATCH] Travis CI: Added Shellcheck test and setup parallel jobs

* Added Shellcheck as a Travis CI test allowing monitoring of code standards
* Setup new parallel jobs allowing all tests to run at the same time. Halving the testing time
---
 .travis.yml               | 13 +++++++++----
 tests/tests_jc2server.sh  |  7 ++++---
 tests/tests_shellcheck.sh | 30 ++++++++++++++++++++++++++++++
 tests/tests_ts3server.sh  |  7 ++++---
 4 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 tests/tests_shellcheck.sh

diff --git a/.travis.yml b/.travis.yml
index c52f1af36..1ae96fc9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,13 @@ addons:
     - libstdc++6:i386
     - net-tools
     - iproute2
+    - shellcheck
 
-script:
-
-    - bash tests/tests_jc2server.sh
-    - bash tests/tests_ts3server.sh
+jobs:
+  include:
+    - stage: jobs
+      script: bash tests/tests_jc2server.sh
+    - # stage name not required
+      script: bash tests/tests_ts3server.sh
+    - # stage name not required
+      script: bash tests/tests_shellcheck.sh
\ No newline at end of file
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index c0d6d0b19..748ef431e 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -2,7 +2,7 @@
 # Project: Game Server Managers - LinuxGSM
 # Author: Daniel Gibbs
 # License: MIT License, Copyright (c) 2017 Daniel Gibbs
-# Purpose: TravisCI Tests: Just Cause 2 | Linux Game Server Management Script
+# Purpose: Travis CI Tests: Just Cause 2 | Linux Game Server Management Script
 # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
 # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki
 # Website: https://gameservermanagers.com
@@ -460,10 +460,11 @@ fn_test_result_fail(){
 }
 
 echo "================================="
-echo "TravisCI Tests"
+echo "Travis CI Tests"
 echo "Linux Game Server Manager"
 echo "by Daniel Gibbs"
-echo "https://gameservermanagers.com"
+echo "Contributors: http://goo.gl/qLmitD"
+echo "https://linuxgsm.com"
 echo "================================="
 echo ""
 echo "================================="
diff --git a/tests/tests_shellcheck.sh b/tests/tests_shellcheck.sh
new file mode 100644
index 000000000..0a9230226
--- /dev/null
+++ b/tests/tests_shellcheck.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Project: Game Server Managers - LinuxGSM
+# Author: Daniel Gibbs
+# License: MIT License, Copyright (c) 2017 Daniel Gibbs
+# Purpose: Travis CI Tests: Shellcheck | Linux Game Server Management Script
+# Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
+# Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki
+# Website: https://gameservermanagers.com
+
+echo "================================="
+echo "Travis CI Tests"
+echo "Linux Game Server Manager"
+echo "by Daniel Gibbs"
+echo "Contributors: http://goo.gl/qLmitD"
+echo "https://linuxgsm.com"
+echo "================================="
+echo ""
+echo "================================="
+echo "Bash Analysis Tests"
+echo "Using: Shellcheck"
+echo "Testing Branch: $TRAVIS_BRANCH"
+echo "================================="
+echo ""
+find . -type f -name "*.sh" -not -path "./shunit2-2.1.6/*" -exec shellcheck --shell=bash --exclude=SC2154,SC2034 {} \;
+find . -type f -name "*.cfg" -not -path "./shunit2-2.1.6/*" -exec shellcheck --shell=bash --exclude=SC2154,SC2034 {} \;
+echo ""
+echo "================================="
+echo "Bash Analysis Tests - Complete!"
+echo "Using: Shellcheck"
+echo "================================="
\ No newline at end of file
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index 7f327dc13..7ef5a4b33 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -2,7 +2,7 @@
 # Project: Game Server Managers - LinuxGSM
 # Author: Daniel Gibbs
 # License: MIT License, Copyright (c) 2017 Daniel Gibbs
-# Purpose: TravisCI Tests: Teamspeak 3 | Linux Game Server Management Script
+# Purpose: Travis CI Tests: Teamspeak 3 | Linux Game Server Management Script
 # Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
 # Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki
 # Website: https://gameservermanagers.com
@@ -460,10 +460,11 @@ fn_test_result_fail(){
 }
 
 echo "================================="
-echo "TravisCI Tests"
+echo "Travis CI Tests"
 echo "Linux Game Server Manager"
 echo "by Daniel Gibbs"
-echo "https://gameservermanagers.com"
+echo "Contributors: http://goo.gl/qLmitD"
+echo "https://linuxgsm.com"
 echo "================================="
 echo ""
 echo "================================="