From 4c6297186febb64bb2b6fe5fd417bbb31ae31ddc Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 2 Jun 2020 00:40:58 +0100
Subject: [PATCH] messaging

---
 lgsm/functions/command_monitor.sh  |  2 +-
 lgsm/functions/command_validate.sh | 17 ++++++++---------
 lgsm/functions/command_wipe.sh     |  6 +++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index 3a333a578..dceee6880 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -107,7 +107,7 @@ for queryattempt in {1..5}; do
 		fn_print_delay_eol_nl
 		fn_script_log_info "Querying port: ${querymethod}: ${ip}:${queryport} : ${queryattempt} : DELAY"
 		fn_script_log_info "Query bypassed: ${gameservername} started less than ${querydelay} minutes ago"
-		fn_script_log_info "Server started: $(date -d @$(cat lgsm/lock/bmdmserver.lock))"
+		fn_script_log_info "Server started: $(date -d @$(cat "${lockdir:?}/${selfname}.lock"))"
 		fn_script_log_info "Current time: $(date)"
 		monitorpass=1
 		core_exit.sh
diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh
index ed1d5345c..2d2052a97 100644
--- a/lgsm/functions/command_validate.sh
+++ b/lgsm/functions/command_validate.sh
@@ -9,18 +9,18 @@ commandaction="Validating"
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 fn_validate(){
-	fn_script_log_warn "Validating server: SteamCMD: Validate might overwrite some customised files"
+	fn_script_log_warn "SteamCMD: Validate might overwrite some customised files"
 	totalseconds=3
 	for seconds in {3..1}; do
-		fn_print_warn "Validating server: SteamCMD: Validate might overwrite some customised files: ${totalseconds}"
+		fn_print_warn "SteamCMD: Validate might overwrite some customised files: ${totalseconds}"
 		totalseconds=$((totalseconds - 1))
 		sleep 1
 		if [ "${seconds}" == "0" ]; then
 			break
 		fi
 	done
-	fn_print_warn_nl "Validating server: SteamCMD: Validate might overwrite some customised files"
-	fn_print_start_nl "Validating server: SteamCMD"
+	fn_print_warn_nl "SteamCMD: Validate might overwrite some customised files"
+	fn_print_start_nl "SteamCMD"
 	fn_script_log_info "Validating server: SteamCMD"
 	if [ -d "${steamcmddir}" ]; then
 		cd "${steamcmddir}" || exit
@@ -49,12 +49,12 @@ fn_validate(){
 	fi
 
 	exitcode=$?
-	fn_print_dots "Validating server: SteamCMD"
+	fn_print_dots "SteamCMD"
 	if [ "${exitcode}" != "0" ]; then
-		fn_print_fail_nl "Validating server: SteamCMD"
+		fn_print_fail_nl "SteamCMD"
 		fn_script_log_fatal "Validating server: SteamCMD: FAIL"
 	else
-		fn_print_ok_nl "Validating server: SteamCMD"
+		fn_print_ok_nl "SteamCMD"
 		fn_script_log_pass "Validating server: SteamCMD: OK"
 	fi
 	core_exit.sh
@@ -75,8 +75,7 @@ fn_stop_warning(){
 	fn_print_warn_nl "this game server will be stopped during validate"
 }
 
-fn_print_dots "Validating server"
-fn_print_dots "Validating server: SteamCMD"
+fn_print_dots "SteamCMD"
 check.sh
 if [ "${status}" != "0" ]; then
 	fn_stop_warning
diff --git a/lgsm/functions/command_wipe.sh b/lgsm/functions/command_wipe.sh
index fc60a6925..7c539ea8d 100644
--- a/lgsm/functions/command_wipe.sh
+++ b/lgsm/functions/command_wipe.sh
@@ -205,8 +205,8 @@ if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[
 	else
 		fn_wipe_server_files
 	fi
-else
-	fn_print_info_nl "No data to wipe was found"
-	fn_script_log_pass "No data to wipe was found"
+	fn_print_ok_nl ""
+	fn_script_log_pass "Wiping server"
 fi
+
 core_exit.sh