From 04bb8485b805fad4c87dd2e33b21dfee7a38b8d3 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 21 May 2020 17:22:04 +0100
Subject: [PATCH] fix(update): fix update on start not working (#2901)

* add space to grep to get accurate session name
* move messages to get proper output
---
 lgsm/functions/command_start.sh            | 7 +++++--
 lgsm/functions/info_distro.sh              | 2 +-
 lgsm/functions/update_factorio.sh          | 4 ----
 lgsm/functions/update_minecraft.sh         | 4 ----
 lgsm/functions/update_minecraft_bedrock.sh | 4 ----
 lgsm/functions/update_mta.sh               | 4 ----
 lgsm/functions/update_mumble.sh            | 4 ----
 lgsm/functions/update_steamcmd.sh          | 4 ----
 lgsm/functions/update_ts3.sh               | 4 ----
 9 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index 7ba90159d..d0487e5d4 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -165,13 +165,12 @@ fn_start_tmux(){
 	echo -en "\n"
 }
 
-
 check.sh
 
-fn_print_dots "${servername}"
 # Is the server already started.
 # $status comes from check_status.sh, which is run by check.sh for this command
 if [ "${status}" != "0" ]; then
+	fn_print_dots "${servername}"
 	fn_print_info_nl "${servername} is already running"
 	fn_script_log_error "${servername} is already running"
 	if [ -z "${exitbypass}" ]; then
@@ -189,8 +188,12 @@ if [ "${updateonstart}" == "yes" ]||[ "${updateonstart}" == "1" ]||[ "${updateon
 	exitbypass=1
 	unset updateonstart
 	command_update.sh
+	commandname="START"
+	commandaction="Starting"
 fi
 
+fn_print_dots "${servername}"
+
 if [ "${shortname}" == "ts3" ]; then
 	fn_start_teamspeak3
 else
diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index 7f1ea12c1..1e2a519f4 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -9,7 +9,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 ### Game Server pid
 if [ "${status}" == "1" ]; then
-	gameserverpid=$(tmux list-sessions -F "#{session_name} #{pane_pid}"| grep "^${sessionname}"|awk '{print $2}')
+	gameserverpid=$(tmux list-sessions -F "#{session_name} #{pane_pid}" | grep "^${sessionname} " | awk '{print $2}')
 fi
 ### Distro information
 
diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index 7d12c0f58..5ff67c448 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -170,7 +170,3 @@ else
 	fn_update_factorio_remotebuild
 	fn_update_factorio_compare
 fi
-
-if [ "${commandname}" != "INSTALL" ]; then
-	core_exit.sh
-fi	
diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh
index 8741db01d..556097bd6 100644
--- a/lgsm/functions/update_minecraft.sh
+++ b/lgsm/functions/update_minecraft.sh
@@ -218,7 +218,3 @@ else
 	fn_update_minecraft_remotebuild
 	fn_update_minecraft_compare
 fi
-
-if [ "${commandname}" != "INSTALL" ]; then
-	core_exit.sh
-fi	
diff --git a/lgsm/functions/update_minecraft_bedrock.sh b/lgsm/functions/update_minecraft_bedrock.sh
index b560f3672..8f408bf29 100644
--- a/lgsm/functions/update_minecraft_bedrock.sh
+++ b/lgsm/functions/update_minecraft_bedrock.sh
@@ -178,7 +178,3 @@ else
 	fn_update_minecraft_remotebuild
 	fn_update_minecraft_compare
 fi
-
-if [ "${commandname}" != "INSTALL" ]; then
-	core_exit.sh
-fi	
diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh
index c37c5ba81..5aaecc122 100644
--- a/lgsm/functions/update_mta.sh
+++ b/lgsm/functions/update_mta.sh
@@ -209,7 +209,3 @@ else
 	fn_update_mta_remotebuild
 	fn_update_mta_compare
 fi
-
-if [ "${commandname}" != "INSTALL" ]; then
-	core_exit.sh
-fi
diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh
index 00fbade5e..ee6a2b0ad 100644
--- a/lgsm/functions/update_mumble.sh
+++ b/lgsm/functions/update_mumble.sh
@@ -148,7 +148,3 @@ else
 	fn_update_mumble_remotebuild
 	fn_update_mumble_compare
 fi
-
-if [ "${commandname}" != "INSTALL" ]; then
-	core_exit.sh
-fi	
diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh
index e7d018d19..8a089c7f7 100644
--- a/lgsm/functions/update_steamcmd.sh
+++ b/lgsm/functions/update_steamcmd.sh
@@ -246,7 +246,3 @@ else
 	fn_update_steamcmd_remotebuild
 	fn_update_steamcmd_compare
 fi
-
-if [ "${commandname}" != "INSTALL" ]; then
-	core_exit.sh
-fi	
diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh
index ec921b3f0..a5cc0dd60 100644
--- a/lgsm/functions/update_ts3.sh
+++ b/lgsm/functions/update_ts3.sh
@@ -219,7 +219,3 @@ else
 	fn_update_ts3_remotebuild
 	fn_update_ts3_compare
 fi
-
-if [ "${commandname}" != "INSTALL" ]; then
-	core_exit.sh
-fi