From cf95c40de808ae7b6424852bc1fbc46764d2e924 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 27 Jun 2016 23:48:12 +0100
Subject: [PATCH] setting up an exit bypass

---
 lgsm/functions/command_debug.sh   |  1 +
 lgsm/functions/command_restart.sh |  2 +-
 lgsm/functions/core_exit.sh       | 24 ++++++++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh
index 655c0607a..a0452f6ff 100644
--- a/lgsm/functions/command_debug.sh
+++ b/lgsm/functions/command_debug.sh
@@ -53,6 +53,7 @@ done
 fn_print_info_nl "Stopping any running servers"
 fn_script_log_info "Stopping any running servers"
 sleep 1
+exitbypass=1
 command_stop.sh
 fn_print_dots "Starting debug"
 fn_script_log_info "Starting debug"
diff --git a/lgsm/functions/command_restart.sh b/lgsm/functions/command_restart.sh
index 35f85b639..23a9d6e60 100644
--- a/lgsm/functions/command_restart.sh
+++ b/lgsm/functions/command_restart.sh
@@ -9,7 +9,7 @@ lgsm_version="210516"
 local modulename="Restarting"
 function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
-restart=1
+exitbypass=1
 info_config.sh
 command_stop.sh
 command_start.sh
\ No newline at end of file
diff --git a/lgsm/functions/core_exit.sh b/lgsm/functions/core_exit.sh
index 4fbda5605..bfef50e7b 100644
--- a/lgsm/functions/core_exit.sh
+++ b/lgsm/functions/core_exit.sh
@@ -6,22 +6,30 @@ lgsm_version="210516"
 
 # Description: handles exiting of LGSM by running and reporting an exit code.
 
+fn_exit_dev_debug(){
+	if [ -f "${rootdir}/.dev-debug" ]; then
+		echo "${function_selfname} exiting with code: ${exitcode}"
+	fi
+}
+
 if [ -n "${exitcode}" ]&&[ "${exitcode}" != "0" ]; then
 	if [ "${exitcode}" == "1" ]; then
-		fn_script_log_fatal "Exiting with code: ${exitcode}"
+		fn_script_log_fatal "${function_selfname} exiting with code: ${exitcode}"
 	elif [ "${exitcode}" == "2" ]; then
-		fn_script_log_error "Exiting with code: ${exitcode}"
+		fn_script_log_error "${function_selfname} exiting with code: ${exitcode}"
 	elif [ "${exitcode}" == "3" ]; then
-		fn_script_log_warn "Exiting with code: ${exitcode}"
+		fn_script_log_warn "${function_selfname} exiting with code: ${exitcode}"
 	else
-		fn_script_log_warn "Exiting with code: ${exitcode}"
+		fn_script_log_warn "${function_selfname} exiting with code: ${exitcode}"
 	fi
+	fn_exit_dev_debug
 	exit ${exitcode}
+elif [ -n "${exitbypass}" ]; then
+	unset exitbypass
 else
+	fn_script_log_pass "${function_selfname} exiting with code: ${exitcode}"
 	exitcode=0
+	fn_exit_dev_debug
+	exit ${exitcode}
 fi
 
-if [ -f "${rootdir}/.dev-debug" ]; then
-	sleep 0.5
-	echo "${function_selfname} exiting with code: ${exitcode}"
-fi
\ No newline at end of file