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 01/25] 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.

From e8f4621cc0a31c2fd7948a022493acc8f148bace Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 13:29:27 +0100
Subject: [PATCH 02/25] ts3 tmux getopt

---
 lgsm/functions/core_getopt.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index d45072862..668089f16 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -77,10 +77,7 @@ fi
 #Backup.
 currentopt+=( "${cmd_backup[@]}" )
 
-# Exclude games without a console.
-if [ "${shortname}" != "ts3" ]; then
-	currentopt+=( "${cmd_console[@]}" "${cmd_debug[@]}" )
-fi
+currentopt+=( "${cmd_console[@]}" "${cmd_debug[@]}" )
 
 ## Game server exclusive commands.
 

From 03de2ca2eba3a1ea7a8348c8b2d932486c50a5c2 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 13:31:13 +0100
Subject: [PATCH 03/25] comments

---
 lgsm/functions/core_getopt.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index 668089f16..25890b3d5 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -74,9 +74,10 @@ if [ -n "${appid}" ]; then
 	currentopt+=( "${cmd_validate[@]}" )
 fi
 
-#Backup.
+# Backup.
 currentopt+=( "${cmd_backup[@]}" )
 
+# Console & Debug
 currentopt+=( "${cmd_console[@]}" "${cmd_debug[@]}" )
 
 ## Game server exclusive commands.

From a8ebcc5266dd1a50c61808035ea574c708f3e4a1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 14:06:32 +0100
Subject: [PATCH 04/25] test

---
 lgsm/config-default/config-lgsm/ts3server/_default.cfg | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
index ab081ccbd..7fe7111bc 100644
--- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
@@ -11,6 +11,11 @@
 
 #### LinuxGSM Settings ####
 
+## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+fn_parms(){
+parms="inifile=${servercfgfullpath} pid_file=ts3server.pid"
+}
+
 ## Notification Alerts
 # (on|off)
 
@@ -115,7 +120,7 @@ glibc="2.17"
 ## Server Specific Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-executable="./ts3server_minimal_runscript.sh"
+executable="./ts3server"
 servercfg="${servicename}.ini"
 servercfgdefault="ts3server.ini"
 servercfgdir="${serverfiles}"

From 88825ac7a29f88a639676942c061dce22291448d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 14:16:12 +0100
Subject: [PATCH 05/25] ts3 start

---
 lgsm/functions/command_start.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index dac7aa2c3..4b61c3d90 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -210,9 +210,5 @@ if [ "${updateonstart}" == "yes" ]||[ "${updateonstart}" == "1" ]||[ "${updateon
 	command_update.sh
 fi
 
-if [ "${shortname}" == "ts3" ]; then
-	fn_start_teamspeak3
-else
-	fn_start_tmux
-fi
+fn_start_tmux
 core_exit.sh

From c361bfb9f0190aabb2a6169df3d318c1590b59c0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 14:18:29 +0100
Subject: [PATCH 06/25] changed stop mode

---
 lgsm/config-default/config-lgsm/ts3server/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
index 7fe7111bc..6e0a4f8a6 100644
--- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
@@ -105,7 +105,7 @@ sleeptime="0.5"
 # 8: 7 Days to Die
 # 9: Gold Source
 # 10: Teamspeak 3
-stopmode="10"
+stopmode="2"
 
 ## LinuxGSM Server Details
 # Do not edit

From 31db555ecb4b901bd497fb78631720eb2982b3cc Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 14:25:13 +0100
Subject: [PATCH 07/25] changes to stop start

---
 lgsm/functions/command_start.sh |  8 ++++++--
 lgsm/functions/command_stop.sh  | 18 ------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index 4b61c3d90..397c4eee2 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -39,7 +39,7 @@ fn_start_teamspeak3(){
 	if [ "${ts3serverpass}" == "1" ]; then
 		./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1
 	else
-		./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1
+		fn_start_tmux
 	fi
 	fn_sleep_time
 	check_status.sh
@@ -210,5 +210,9 @@ if [ "${updateonstart}" == "yes" ]||[ "${updateonstart}" == "1" ]||[ "${updateon
 	command_update.sh
 fi
 
-fn_start_tmux
+if [ "${shortname}" == "ts3" ]; then
+	fn_start_teamspeak3
+else
+	fn_start_tmux
+fi
 core_exit.sh
diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh
index 01cce6a4a..869e19761 100644
--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@@ -200,22 +200,6 @@ fn_stop_graceful_select(){
 		fn_stop_graceful_sdtd
 	elif [ "${stopmode}" == "9" ]; then
 		fn_stop_graceful_goldsource
-	elif [ "${stopmode}" == "10" ]; then
-		fn_stop_teamspeak3
-	fi
-}
-
-fn_stop_teamspeak3(){
-	fn_print_dots "${servername}"
-	"${serverfiles}"/ts3server_startscript.sh stop > /dev/null 2>&1
-	check_status.sh
-	if [ "${status}" == "0" ]; then
-		rm -f "${rootdir}/${lockselfname}"
-		fn_print_ok_nl "${servername}"
-		fn_script_log_pass "Stopped ${servername}"
-	else
-		fn_print_fail_nl "Unable to stop ${servername}"
-		fn_script_log_error "Unable to stop ${servername}"
 	fi
 }
 
@@ -240,8 +224,6 @@ fn_stop_pre_check(){
 	if [ "${status}" == "0" ]; then
 		fn_print_info_nl "${servername} is already stopped"
 		fn_script_log_error "${servername} is already stopped"
-	elif [ "${shortname}" == "ts3" ]; then
-		fn_stop_teamspeak3
 	else
 		# Select graceful shutdown.
 		fn_stop_graceful_select

From 4297954885401edb30fdb8c8a42b5f04f6d43df9 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 14:27:13 +0100
Subject: [PATCH 08/25] add consolelog

---
 lgsm/config-default/config-lgsm/ts3server/_default.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
index 6e0a4f8a6..3201314b9 100644
--- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
@@ -134,6 +134,7 @@ logdir="${rootdir}/log"
 gamelogdir="${serverfiles}/logs"
 lgsmlogdir="${logdir}/script"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
+consolelog="${consolelogdir}/${servicename}-console.log"
 alertlog="${lgsmlogdir}/${servicename}-alert.log"
 postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
 

From 06a7743dcdeac05caa3649d1da0e58af98b2d764 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 23:46:55 +0100
Subject: [PATCH 09/25] added missing consolelogdir

---
 lgsm/config-default/config-lgsm/ts3server/_default.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
index 3201314b9..4b3ca814d 100644
--- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
@@ -133,6 +133,7 @@ backupdir="${lgsmdir}/backup"
 logdir="${rootdir}/log"
 gamelogdir="${serverfiles}/logs"
 lgsmlogdir="${logdir}/script"
+consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
 consolelog="${consolelogdir}/${servicename}-console.log"
 alertlog="${lgsmlogdir}/${servicename}-alert.log"

From 414658410ca9382c543fc1c68bebfc554c899180 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 23:49:37 +0100
Subject: [PATCH 10/25] removed ts3 if

---
 lgsm/functions/info_distro.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index c7bf38a28..aee166272 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -9,9 +9,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 ### Game Server pid
 if [ "${status}" == "1" ]; then
-	if [ "${shortname}" != "ts3" ]; then
-		gameserverpid=$(tmux list-sessions -F "#{session_name} #{pane_pid}"| grep "^${servicename}"|awk '{print $2}')
-	fi
+	gameserverpid=$(tmux list-sessions -F "#{session_name} #{pane_pid}"| grep "^${servicename}"|awk '{print $2}')
 fi
 ### Distro information
 

From 623a87e70bd6f24dd4f788cf5f14cf95a37c4b61 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 19 Oct 2019 23:54:45 +0100
Subject: [PATCH 11/25] change password

---
 lgsm/functions/command_start.sh           | 6 +-----
 lgsm/functions/command_ts3_server_pass.sh | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index 397c4eee2..55bbfd414 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -36,11 +36,7 @@ fn_start_teamspeak3(){
 		install_eula.sh
 	fi
 	cd "${executabledir}" || exit
-	if [ "${ts3serverpass}" == "1" ]; then
-		./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1
-	else
-		fn_start_tmux
-	fi
+	fn_start_tmux
 	fn_sleep_time
 	check_status.sh
 	if [ "${status}" == "0" ]; then
diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index d05dfdfc5..240b7c454 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -42,7 +42,8 @@ if [ "${status}" != "0" ]; then
 	exitbypass="1"
 	command_stop.sh
 	fn_serveradmin_password_set
-	ts3serverpass="0"
+	parms="inifile=${servercfgfullpath} pid_file=ts3server.pid"
+W	ts3serverpass="0"
 	fn_print_info_nl "Restarting server normally"
 	fn_script_log_info "Restarting server normally"
 	command_restart.sh

From 1291bfd98bcb64588420a0c0b5edd9891dc4af93 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:00:44 +0100
Subject: [PATCH 12/25] ts3 if

---
 lgsm/functions/check_logs.sh          | 2 +-
 lgsm/functions/command_postdetails.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/check_logs.sh b/lgsm/functions/check_logs.sh
index 9f3e87427..61a8f2833 100644
--- a/lgsm/functions/check_logs.sh
+++ b/lgsm/functions/check_logs.sh
@@ -15,7 +15,7 @@ fn_check_logs(){
 }
 
 # Create directories for the script and console logs.
-if [ ! -d "${lgsmlogdir}" ]||[ ! -d "${consolelogdir}" ]&&[ "${shortname}" != "ts3" ]; then
+if [ ! -d "${lgsmlogdir}" ]||[ ! -d "${consolelogdir}" ]; then
 	fn_check_logs
 fi
 
diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh
index 9ce9920a4..4bede0eb2 100644
--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@@ -67,7 +67,7 @@ else
 		fn_info_message_script
 		fn_info_message_backup
 		# Some game servers do not have parms.
-		if [ "${shortname}" != "ts3" ]&&[ "${shortname}" != "jc2" ]&&[ "${shortname}" != "jc3" ]&&[ "${shortname}" != "dst" ]&&[ "${shortname}" != "pz" ]&&[ "${engine}" != "renderware" ]; then
+		if [ "${shortname}" != "jc2" ]&&[ "${shortname}" != "jc3" ]&&[ "${shortname}" != "dst" ]&&[ "${shortname}" != "pz" ]&&[ "${engine}" != "renderware" ]; then
 			fn_parms
 			fn_info_message_commandlineparms
 		fi

From de5c747e9171237e580bd51883a704e335f7b562 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:03:46 +0100
Subject: [PATCH 13/25] consoellogdate

---
 lgsm/config-default/config-lgsm/ts3server/_default.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
index 4b3ca814d..1cf740167 100644
--- a/lgsm/config-default/config-lgsm/ts3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
@@ -141,3 +141,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
 
 ## Logs Naming
 lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

From 899da8808a057f6b0abcf8a466bf8632070bc6f0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:13:46 +0100
Subject: [PATCH 14/25] bug

---
 lgsm/functions/command_ts3_server_pass.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index 240b7c454..851738dd3 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -23,7 +23,7 @@ fn_serveradmin_password_prompt(){
 }
 
 fn_serveradmin_password_set(){
-	fn_print_info_nl "Starting server with new password..."
+	fn_print_info_nl "Starting server with new password"
 	fn_script_log_info "Starting server with new password"
 	# Start server in "new password mode".
 	ts3serverpass="1"
@@ -43,7 +43,7 @@ if [ "${status}" != "0" ]; then
 	command_stop.sh
 	fn_serveradmin_password_set
 	parms="inifile=${servercfgfullpath} pid_file=ts3server.pid"
-W	ts3serverpass="0"
+	ts3serverpass="0"
 	fn_print_info_nl "Restarting server normally"
 	fn_script_log_info "Restarting server normally"
 	command_restart.sh

From 2e4bff7922952b75008bdcc4d792782654f938bc Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:17:13 +0100
Subject: [PATCH 15/25] ui

---
 lgsm/functions/command_ts3_server_pass.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index 851738dd3..b107967f1 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -11,7 +11,6 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_serveradmin_password_prompt(){
 	fn_print_header
-	echo -e "Press \"CTRL+b d\" to exit console."
 	fn_print_information_nl "You are about to change the ${gamename} ServerAdmin password."
 	fn_print_warning_nl "${gamename} will restart during this process."
 	echo -e ""
@@ -19,7 +18,7 @@ fn_serveradmin_password_prompt(){
 		echo Exiting; exit
 	fi
 	fn_script_log_info "Initiating ${gamename} ServerAdmin password change"
-	read -rp "Enter new password : " newpassword
+	read -rp "Enter new password: " newpassword
 }
 
 fn_serveradmin_password_set(){

From 41b40c7c7876258c25ce752d3015279e6a297b09 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:29:55 +0100
Subject: [PATCH 16/25] removed Exiting

---
 lgsm/functions/command_console.sh         | 2 +-
 lgsm/functions/command_debug.sh           | 2 +-
 lgsm/functions/command_mods_install.sh    | 2 +-
 lgsm/functions/command_mods_remove.sh     | 2 +-
 lgsm/functions/command_ts3_server_pass.sh | 8 ++++----
 lgsm/functions/command_wipe.sh            | 2 +-
 lgsm/functions/compress_unreal2_maps.sh   | 2 +-
 lgsm/functions/compress_ut99_maps.sh      | 2 +-
 lgsm/functions/install_retry.sh           | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lgsm/functions/command_console.sh b/lgsm/functions/command_console.sh
index f428ce56e..1d08b2c92 100644
--- a/lgsm/functions/command_console.sh
+++ b/lgsm/functions/command_console.sh
@@ -19,7 +19,7 @@ fn_print_warning_nl "Do NOT press CTRL+c to exit."
 echo -e "	* https://docs.linuxgsm.com/commands/console"
 echo -e ""
 if ! fn_prompt_yn "Continue?" Y; then
-	echo Exiting; return
+	return
 fi
 fn_print_dots "Accessing console"
 check_status.sh
diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh
index 9422bbad7..5b3629844 100644
--- a/lgsm/functions/command_debug.sh
+++ b/lgsm/functions/command_debug.sh
@@ -86,7 +86,7 @@ echo -e "Press CTRL+c to drop out of debug mode."
 fn_print_warning_nl "If ${servicename} is already running it will be stopped."
 echo -e ""
 if ! fn_prompt_yn "Continue?" Y; then
-	echo Exiting; return
+	return
 fi
 
 fn_print_info_nl "Stopping any running servers"
diff --git a/lgsm/functions/command_mods_install.sh b/lgsm/functions/command_mods_install.sh
index 16ba9956f..58b0dc747 100644
--- a/lgsm/functions/command_mods_install.sh
+++ b/lgsm/functions/command_mods_install.sh
@@ -87,7 +87,7 @@ if [ -f "${modsinstalledlistfullpath}" ]; then
 		fn_script_log_warn "${modprettyname} is already installed"
 		echo -e " * Any configs may be overwritten."
 		if ! fn_prompt_yn "Continue?" Y; then
-			echo Exiting; core_exit.sh
+			core_exit.sh
 		fi
 		fn_script_log_info "User selected to continue"
 	fi
diff --git a/lgsm/functions/command_mods_remove.sh b/lgsm/functions/command_mods_remove.sh
index 3d2dae54b..08d18892f 100644
--- a/lgsm/functions/command_mods_remove.sh
+++ b/lgsm/functions/command_mods_remove.sh
@@ -46,7 +46,7 @@ done
 fn_print_warning_nl "You are about to remove ${cyan}${usermodselect}${default}."
 echo -e " * Any custom files/configuration will be removed."
 if ! fn_prompt_yn "Continue?" Y; then
-	echo Exiting; exit
+	core_exit.sh
 fi
 
 currentmod="${usermodselect}"
diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index b107967f1..9a9f01c2c 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -5,8 +5,8 @@
 # Website: https://linuxgsm.com
 # Description: Changes TS3 serveradmin password.
 
-local commandname="TS3-CHANGE-PASS"
-local commandaction="ServerAdmin Password Change"
+local commandname="PASSWORD-CHANGE"
+local commandaction="Password Change"
 local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_serveradmin_password_prompt(){
@@ -22,7 +22,7 @@ fn_serveradmin_password_prompt(){
 }
 
 fn_serveradmin_password_set(){
-	fn_print_info_nl "Starting server with new password"
+	fn_print_info_nl "Starting "
 	fn_script_log_info "Starting server with new password"
 	# Start server in "new password mode".
 	ts3serverpass="1"
@@ -41,7 +41,7 @@ if [ "${status}" != "0" ]; then
 	exitbypass="1"
 	command_stop.sh
 	fn_serveradmin_password_set
-	parms="inifile=${servercfgfullpath} pid_file=ts3server.pid"
+	parms="serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1"
 	ts3serverpass="0"
 	fn_print_info_nl "Restarting server normally"
 	fn_script_log_info "Restarting server normally"
diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh
index 9c83d2897..423491013 100644
--- a/lgsm/functions/command_wipe.sh
+++ b/lgsm/functions/command_wipe.sh
@@ -185,7 +185,7 @@ if [ "${shortname}" == "rust" ]; then
 	if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then
 		fn_print_warning_nl "Any user, storage, log and map data from ${serveridentitydir} will be erased."
 		if ! fn_prompt_yn "Continue?" Y; then
-				echo Exiting; core_exit.sh
+				core_exit.sh
 		fi
 		fn_script_log_info "User selects to erase any user, storage, log and map data from ${serveridentitydir}"
 		fn_sleep_time
diff --git a/lgsm/functions/compress_unreal2_maps.sh b/lgsm/functions/compress_unreal2_maps.sh
index e5868bfbb..3208212f2 100644
--- a/lgsm/functions/compress_unreal2_maps.sh
+++ b/lgsm/functions/compress_unreal2_maps.sh
@@ -18,7 +18,7 @@ echo -e ""
 echo -e "${compressedmapsdir}"
 echo -e ""
 if ! fn_prompt_yn "Start compression?" Y; then
-	echo Exiting; return
+	return
 fi
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 rm -rfv "${serverfiles}/Maps/"*.ut2.uz2
diff --git a/lgsm/functions/compress_ut99_maps.sh b/lgsm/functions/compress_ut99_maps.sh
index f3f5449a5..d52ae01d0 100644
--- a/lgsm/functions/compress_ut99_maps.sh
+++ b/lgsm/functions/compress_ut99_maps.sh
@@ -18,7 +18,7 @@ echo -e ""
 echo -e "${compressedmapsdir}"
 echo -e ""
 if ! fn_prompt_yn "Start compression?" Y; then
-	echo Exiting; return
+	return
 fi
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 rm -rfv "${serverfiles}/Maps/"*.unr.uz
diff --git a/lgsm/functions/install_retry.sh b/lgsm/functions/install_retry.sh
index e2918c268..f5f4462ad 100644
--- a/lgsm/functions/install_retry.sh
+++ b/lgsm/functions/install_retry.sh
@@ -9,7 +9,7 @@ local commandaction="Install"
 local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if fn_prompt_yn "Retry install?" Y; then
-	command_install.sh; exit
+	command_install.sh; core_exit.sh
 else
-	echo Exiting; exit
+	core_exit.sh
 fi

From 6a8cd82a837182e4dd8389e81774f89b93b73439 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:32:06 +0100
Subject: [PATCH 17/25] messages

---
 lgsm/functions/command_ts3_server_pass.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index 9a9f01c2c..f5d895987 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -19,11 +19,12 @@ fn_serveradmin_password_prompt(){
 	fi
 	fn_script_log_info "Initiating ${gamename} ServerAdmin password change"
 	read -rp "Enter new password: " newpassword
+	fn_print_info_nl "Changing password"
+	fn_script_log_info "Changing password"
 }
 
 fn_serveradmin_password_set(){
-	fn_print_info_nl "Starting "
-	fn_script_log_info "Starting server with new password"
+
 	# Start server in "new password mode".
 	ts3serverpass="1"
 	exitbypass="1"
@@ -35,6 +36,7 @@ fn_serveradmin_password_set(){
 # Running functions.
 check.sh
 fn_serveradmin_password_prompt
+
 check_status.sh
 if [ "${status}" != "0" ]; then
 	# Stop any running server.
@@ -43,8 +45,6 @@ if [ "${status}" != "0" ]; then
 	fn_serveradmin_password_set
 	parms="serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1"
 	ts3serverpass="0"
-	fn_print_info_nl "Restarting server normally"
-	fn_script_log_info "Restarting server normally"
 	command_restart.sh
 else
 	fn_serveradmin_password_set

From 2e42dc53b01ba53dfaa3a6444d58ce75ea11e84c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:35:40 +0100
Subject: [PATCH 18/25] removed ts3 if

---
 lgsm/functions/check_status.sh            | 15 +--------------
 lgsm/functions/command_ts3_server_pass.sh |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lgsm/functions/check_status.sh b/lgsm/functions/check_status.sh
index 529dcbf5b..7a5e62d6e 100644
--- a/lgsm/functions/check_status.sh
+++ b/lgsm/functions/check_status.sh
@@ -8,17 +8,4 @@
 local commandname="CHECK"
 local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-if [ "${shortname}" == "ts3" ]; then
-	# 1: Server is running
-	# 0: Server seems to have died
-	# 0: No server running (ts3server.pid is missing)
-	status=$("${executabledir}/ts3server_startscript.sh" status servercfgfullpathfile="${servercfgfullpath}")
-	if [ "${status}" == "Server is running" ]; then
-		status=1
-	else
-		ts3error="${status}"
-		status=0
-	fi
-else
-	status=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | grep -Ecx "^${servicename}")
-fi
+status=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | grep -Ecx "^${servicename}")
diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index f5d895987..1a912a39a 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -29,7 +29,7 @@ fn_serveradmin_password_set(){
 	ts3serverpass="1"
 	exitbypass="1"
 	command_start.sh
-	fn_print_ok_nl "Password applied"
+	fn_print_ok_nl "New password applied"
 	fn_script_log_pass "New ServerAdmin password applied"
 }
 

From 0734f2f86b3c2e4331b5593deb49e764adc15931 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:40:49 +0100
Subject: [PATCH 19/25] remove check that is not required

---
 lgsm/functions/command_ts3_server_pass.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index 1a912a39a..d7f3b73a0 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -24,7 +24,6 @@ fn_serveradmin_password_prompt(){
 }
 
 fn_serveradmin_password_set(){
-
 	# Start server in "new password mode".
 	ts3serverpass="1"
 	exitbypass="1"
@@ -36,8 +35,6 @@ fn_serveradmin_password_set(){
 # Running functions.
 check.sh
 fn_serveradmin_password_prompt
-
-check_status.sh
 if [ "${status}" != "0" ]; then
 	# Stop any running server.
 	exitbypass="1"

From 2559dcebe1bdb646c9dbfe8ebd06fc737c94a3c2 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 00:48:28 +0100
Subject: [PATCH 20/25] removed duplicate code

---
 lgsm/functions/command_start.sh | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index 55bbfd414..7fc8a2987 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -24,30 +24,11 @@ fn_start_teamspeak3(){
 		sleep 5
 		touch "${servercfgfullpath}"
 	fi
-	fn_sleep_time
-	if [ -f "${lgsmlog}" ]; then
-		mv "${lgsmlog}" "${lgsmlogdate}"
-	fi
-
-	# Create lockfile.
-	date '+%s' > "${rootdir}/${lockselfname}"
 	# Accept license.
 	if [ ! -f "${executabledir}/.ts3server_license_accepted" ]; then
 		install_eula.sh
 	fi
-	cd "${executabledir}" || exit
 	fn_start_tmux
-	fn_sleep_time
-	check_status.sh
-	if [ "${status}" == "0" ]; then
-		fn_print_fail_nl "Unable to start ${servername}"
-		fn_script_log_fatal "Unable to start ${servername}"
-		echo -e "	Check log files: ${logdir}"
-		core_exit.sh
-	else
-		fn_print_ok_nl "${servername}"
-		fn_script_log_pass "Started ${servername}"
-	fi
 }
 
 fn_start_tmux(){

From 5c3c36e8d2d5e7d3fb450d6406eeaa5eb319f9a3 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 01:01:22 +0100
Subject: [PATCH 21/25] fixing privilege key generation

---
 lgsm/functions/install_ts3db.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh
index cd2ef8653..352b77d73 100644
--- a/lgsm/functions/install_ts3db.sh
+++ b/lgsm/functions/install_ts3db.sh
@@ -71,6 +71,6 @@ echo -e "================================="
 fn_sleep_time
 fn_print_information_nl "Save these details for later."
 cd "${executabledir}" || exit
-${executable} start inifile=ts3-server.ini
+./ts3server_startscript.sh start inifile=ts3-server.ini | tee "${serverfiles}/privilege_key.txt"
 sleep 5
-${executable} stop
+./ts3server_startscript.sh stop

From 3bfaad9ca9bd7da25da2dfcb2aa00f0f16664230 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 17:22:47 +0100
Subject: [PATCH 22/25] changed status to gameserverpid

---
 lgsm/functions/info_distro.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index aee166272..1da562cff 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -98,7 +98,7 @@ cpumodel=$(awk -F: '/model name/ {name=$2} END {print name}' /proc/cpuinfo | sed
 cpucores=$(awk -F: '/model name/ {core++} END {print core}' /proc/cpuinfo)
 cpufreqency=$(awk -F: ' /cpu MHz/ {freq=$2} END {print freq " MHz"}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//')
 # CPU usage of the game server pid
-if [ "${status}" == "1" ]; then
+if [ "${gameserverpid}" ]; then
 	cpuused=$(ps --forest -o pcpu -g "${gameserverpid}"|awk '{s+=$1} END {print s}')
 fi
 
@@ -136,7 +136,7 @@ if [ -n "$(command -v numfmt 2>/dev/null)" ]; then
 	swapused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^SwapTotal /proc/meminfo | awk '{print $2}')-$(grep ^SwapFree /proc/meminfo | awk '{print $2}')))K")
 	# RAM usage of the game server pid
 	# MB
-	if [ "${status}" == "1" ]; then
+	if [ "${gameserverpid}" ]; then
 		memused=$(ps --forest -o rss -g "${gameserverpid}" | awk '{s+=$1} END {print s}'| awk '{$1/=1024;printf "%.0fMB\t",$1}{print $2}')
 	# %
 		pmemused=$(ps --forest -o %mem -g "${gameserverpid}" | awk '{s+=$1} END {print s}')

From ef2660e92c7aaf7d267bbd9c083cb0a0ffe800b5 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 17:28:10 +0100
Subject: [PATCH 23/25] output

---
 lgsm/functions/install_ts3db.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh
index 352b77d73..444c19da5 100644
--- a/lgsm/functions/install_ts3db.sh
+++ b/lgsm/functions/install_ts3db.sh
@@ -71,6 +71,6 @@ echo -e "================================="
 fn_sleep_time
 fn_print_information_nl "Save these details for later."
 cd "${executabledir}" || exit
-./ts3server_startscript.sh start inifile=ts3-server.ini | tee "${serverfiles}/privilege_key.txt"
+./ts3server_startscript.sh start inifile=ts3-server.ini 2>&1 | tee "${serverfiles}/privilege_key.txt"
 sleep 5
 ./ts3server_startscript.sh stop

From 10a24f19308d243bfd63fda3372dc4f38c5be3ec Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 18:09:39 +0100
Subject: [PATCH 24/25] added privilege key save location

---
 lgsm/functions/install_ts3db.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lgsm/functions/install_ts3db.sh b/lgsm/functions/install_ts3db.sh
index 444c19da5..744b4bea7 100644
--- a/lgsm/functions/install_ts3db.sh
+++ b/lgsm/functions/install_ts3db.sh
@@ -70,6 +70,8 @@ echo -e "${lightyellow}Getting privilege key${default}"
 echo -e "================================="
 fn_sleep_time
 fn_print_information_nl "Save these details for later."
+fn_print_information_nl "Key also saved in:"
+echo -e "${serverfiles}/privilege_key.txt"
 cd "${executabledir}" || exit
 ./ts3server_startscript.sh start inifile=ts3-server.ini 2>&1 | tee "${serverfiles}/privilege_key.txt"
 sleep 5

From 370e394fae53b8d3aa8315f94ceab6c42d3d7af2 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Oct 2019 19:35:10 +0100
Subject: [PATCH 25/25] codacy fixes

---
 lgsm/functions/command_ts3_server_pass.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/command_ts3_server_pass.sh b/lgsm/functions/command_ts3_server_pass.sh
index d7f3b73a0..fc242c16e 100644
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@@ -40,7 +40,7 @@ if [ "${status}" != "0" ]; then
 	exitbypass="1"
 	command_stop.sh
 	fn_serveradmin_password_set
-	parms="serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1"
+	parms="serveradmin_password=\"${newpassword}\" inifile=\"${servercfgfullpath}\" > /dev/null 2>&1"
 	ts3serverpass="0"
 	command_restart.sh
 else