From c8a5f9b792cdde34aae7519d7a0683c8f252e833 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 7 May 2015 19:13:16 +0100
Subject: [PATCH] Improved Tmux error reporting.

---
 functions/fn_check_tmux |  4 ++--
 functions/fn_start      | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/functions/fn_check_tmux b/functions/fn_check_tmux
index 82a214d33..5916c1642 100644
--- a/functions/fn_check_tmux
+++ b/functions/fn_check_tmux
@@ -6,7 +6,7 @@
 
 # Checks if tmux is installed as too many users do not RTFM or know how to use Google.
 
-if [ "$(command -v tmux)" ]||[ "$(which tmux)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
+if [ "$(command -v tmux)" ]||[ "$(which tmux >/dev/null 2>&1)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
 	:
 else
 	fn_printfailnl "Tmux not installed"
@@ -15,6 +15,6 @@ else
 	echo "	* Tmux is required to run this server."
 	# Suitable passive agressive message
 	echo "	* Please see the the following link."
-	echo "  * http://gameservermanagers.com/tmux"
+	echo "	* http://gameservermanagers.com/tmux"
 	exit
 fi
\ No newline at end of file
diff --git a/functions/fn_start b/functions/fn_start
index 653a3e105..c98bbae1b 100644
--- a/functions/fn_start
+++ b/functions/fn_start
@@ -2,7 +2,7 @@
 # LGSM fn_start function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 220415
+# Version: 070515
 
 # Description: Starts the server.
 
@@ -119,26 +119,33 @@ else
 fi
 sleep 1
 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -Ec "^${servicename}:")
-
 # If the server fails to start
 if [ "${tmuxwc}" -eq 0 ]; then
 	fn_printfail "Unable to start ${servername}"
 	fn_scriptlog "Unable to start ${servername}"
 	sleep 1
 	if [ -s "${scriptlogdir}/.${servicename}-tmux-error.tmp" ]; then
-		fn_printfail "Unable to start ${servername}: Tmux returned the following error:"
-		fn_scriptlog "tmux returned the following error"
+		fn_printfail "Unable to start ${servername}: Tmux error:"
+		fn_scriptlog "Tmux error"
 		sleep 1
 		echo -en "\n"
 		echo ""
+		echo "Command"
+		echo "================================="
+		echo "tmux new-session -d -s ${servicename} "${executable} ${parms}""
+		echo "tmux new-session -d -s ${servicename} "${executable} ${parms}"" >> "${scriptlog}"
+		echo ""
+		echo "Error"
+		echo "================================="
 		cat "${scriptlogdir}/.${servicename}-tmux-error.tmp"
 		cat "${scriptlogdir}/.${servicename}-tmux-error.tmp" >> "${scriptlog}"
-		sleep 1
-		echo ""
+
 		# Detected error http://gameservermanagers.com/issues
 		if [ $(grep -c "Operation not permitted" "${scriptlogdir}/.${servicename}-tmux-error.tmp") ];then
+		echo ""
+		echo "Fix"
+		echo "================================="
 			if [ ! $(grep "tty:" /etc/group|grep "$(whoami)") ];then
-				echo "================================="
 				echo "$(whoami) is not part of the tty group."
 				fn_scriptlog "$(whoami) is not part of the tty group."
 				group=$(grep tty /etc/group)
@@ -152,16 +159,9 @@ if [ "${tmuxwc}" -eq 0 ]; then
 				echo ""
 				echo "http://gameservermanagers.com/tmux-op-perm"
 				fn_scriptlog "http://gameservermanagers.com/tmux-op-perm"
-				echo "================================="
 			else
-				echo "$(whoami) is part of the tty group."
-				group=$(grep tty /etc/group)
-				echo ""
-				echo "	${group}"
-				fn_scriptlog "${group}"
-				echo ""
-				echo "No known fix currently."
-				fn_scriptlog "No known fix currently."
+				echo "No known fix currently. Please log an issue."
+				fn_scriptlog "No known fix currently. Please log an issue."
 				echo "http://gameservermanagers.com/issues"
 				fn_scriptlog "http://gameservermanagers.com/issues"
 			fi