From 15bd3106f1f4cfa6b42419bb60db4aa7b47415cd Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 13:26:52 +0100
Subject: [PATCH] changes to integrate ts3 with tmux

---
 .../config-lgsm/ts3server/_default.cfg        |  2 +-
 lgsm/functions/check_deps.sh                  | 25 ++++++++-----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
index 54f70adb0..ab081ccbd 100644
--- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
@@ -115,7 +115,7 @@ glibc="2.17"
 ## Server Specific Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-executable="./ts3server_startscript.sh"
+executable="./ts3server_minimal_runscript.sh"
 servercfg="${servicename}.ini"
 servercfgdefault="ts3server.ini"
 servercfgdir="${serverfiles}"
diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 4f2bc5892..91f131509 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -337,13 +337,10 @@ fn_deps_build_debian(){
 	# LinuxGSM requirements.
 	array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq )
 
-	# All servers except ts3 require tmux.
-	if [ "${shortname}" != "ts3" ]; then
-		if [ "$(command -v tmux 2>/dev/null)" ]; then
-			tmuxcheck=1 # Added for users compiling tmux from source to bypass check.
-		else
-			array_deps_required+=( tmux )
-		fi
+	if [ "$(command -v tmux 2>/dev/null)" ]; then
+		tmuxcheck=1 # Added for users compiling tmux from source to bypass check.
+	else
+		array_deps_required+=( tmux )
 	fi
 
 	# All servers except ts3, mumble, GTA and minecraft servers require libstdc++6 and lib32gcc1.
@@ -400,7 +397,7 @@ fn_deps_build_debian(){
 		else
 			array_deps_required+=( openjdk-8-jre-headless )
 		fi
-	# Medal of Honor: Allied Assault 
+	# Medal of Honor: Allied Assault
 	elif [ "${shortname}" == "mohaa" ]; then
 		array_deps_required+=( libstdc++5:i386 )
 	# Project Zomboid
@@ -467,13 +464,11 @@ fn_deps_build_redhat(){
 	fi
 
 	# All servers except ts3 require tmux.
-	if [ "${shortname}" != "ts3" ]; then
-		if [ "$(command -v tmux 2>/dev/null)" ]; then
-			# Added for users compiling tmux from source to bypass check.
-			tmuxcheck=1
-		else
-			array_deps_required+=( tmux )
-		fi
+	if [ "$(command -v tmux 2>/dev/null)" ]; then
+		# Added for users compiling tmux from source to bypass check.
+		tmuxcheck=1
+	else
+		array_deps_required+=( tmux )
 	fi
 
 	# All servers except ts3, mumble, multi theft auto and minecraft servers require glibc.i686 and libstdc++.i686.