From cdcc6290e5661f956b54bb53da3340020c162420 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 9 Aug 2016 10:38:34 +0100
Subject: [PATCH] tmux updates

removed check_tmux.sh as handled by check_deps
fixes handling of tmux for complied versions
---
 lgsm/functions/check.sh      | 10 +---------
 lgsm/functions/check_deps.sh | 12 ++++++------
 lgsm/functions/check_tmux.sh | 21 ---------------------
 3 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 lgsm/functions/check_tmux.sh

diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh
index 2620af6fc..d3bab79b8 100644
--- a/lgsm/functions/check.sh
+++ b/lgsm/functions/check.sh
@@ -13,7 +13,7 @@ local commandname="CHECK"
 check_root.sh
 check_permissions.sh
 
-if [ "${function_selfname}" != "command_install.sh" ] && [ "${function_selfname}" != "command_update_functions.sh" ]; then
+if [ "${function_selfname}" != "command_install.sh" ]&&[ "${function_selfname}" != "command_update_functions.sh" ]; then
 	check_system_dir.sh
 fi
 
@@ -59,14 +59,6 @@ do
 	fi
 done
 
-local allowed_commands_array=( command_console.sh command_start.sh )
-for allowed_command in "${allowed_commands_array[@]}"
-do
-	if [ "${allowed_command}" == "${function_selfname}" ]||[ "${gamename}" != "TeamSpeak 3" ]; then
-		check_tmux.sh
-	fi
-done
-
 local allowed_commands_array=( command_console.sh command_debug.sh command_details.sh command_monitor.sh command_start.sh command_stop.sh )
 for allowed_command in "${allowed_commands_array[@]}"
 do
diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 7f4fe1624..4b04694a5 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -18,10 +18,10 @@ fn_deps_detector(){
 	if [ "${depstatus}" == "0" ]; then
 		missingdep=0
 		if [ "${function_selfname}" == "command_install.sh" ]; then
-			if [ "${tmuxcheck}" != "1" ]; then
+			if [ "${tmuxcheck}" == "1" ]; then
 				# Added for users compiling tmux from source to bypass rpm check
 				echo -e "${green}tmux${default}"
-				tmuxcheck=1
+				unset tmuxcheck
 			fi
 			echo -e "${green}${deptocheck}${default}"
 			sleep 0.5
@@ -142,8 +142,8 @@ if [ -n "$(command -v dpkg-query)" ]; then
 
 	# All servers except ts3 require tmux
 	if [ "${executable}" != "./ts3server_startscript.sh" ]; then
-		if [ "$(command -v tmux)" ]||[ "$(which tmux)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
-			: # Added for users compiling tmux from source to bypass rpm check
+		if [ "$(command -v tmux)" ]||[ "$(which tmux 2>/dev/null)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
+			tmuxcheck=1 # Added for users compiling tmux from source to bypass rpm check
 		else
 			array_deps_required+=( tmux )
 		fi
@@ -201,8 +201,8 @@ elif [ -n "$(command -v yum)" ]; then
 
 	# All servers except ts3 require tmux
 	if [ "${executable}" != "./ts3server_startscript.sh" ]; then
-		if [ "$(command -v tmux)" ]||[ "$(which tmux)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
-			: # Added for users compiling tmux from source to bypass rpm check
+		if [ "$(command -v tmux)" ]||[ "$(which tmux 2>/dev/null)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
+			tmuxcheck=1 # Added for users compiling tmux from source to bypass rpm check
 		else
 			array_deps_required+=( tmux )
 		fi
diff --git a/lgsm/functions/check_tmux.sh b/lgsm/functions/check_tmux.sh
deleted file mode 100644
index 3af90a4b6..000000000
--- a/lgsm/functions/check_tmux.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# LGSM check_tmux.sh function
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-# Description: Checks if tmux is installed as too many users do not RTFM or know how to use Google.
-
-local commandname="CHECK"
-local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
-
-if [ "$(command -v tmux)" ]||[ "$(which tmux >/dev/null 2>&1)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
-	:
-else
-	fn_print_fail_nl "Tmux not installed"
-	sleep 1
-	fn_script_log_fatal "Tmux is not installed"
-	echo "	* Tmux is required to run this server."
-	# Suitable passive agressive message
-	echo "	* Please see the the following link."
-	echo "	* https://gameservermanagers.com/tmux-not-found"
-	core_exit.sh
-fi