From ffc7fe5f5b986fdaea052a91d931aca1f7c32873 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 16 Dec 2022 11:29:29 +0100
Subject: [PATCH] War for conflicting scripts only if script is running in a
 terminal.

---
 check_local_elasticsearch_service.sh | 29 +++++++++++++++++++++++-----
 check_local_mattermost_service.sh    | 29 +++++++++++++++++++++++-----
 check_local_webservice.sh            | 29 +++++++++++++++++++++++-----
 3 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/check_local_elasticsearch_service.sh b/check_local_elasticsearch_service.sh
index 72d923f..4191662 100755
--- a/check_local_elasticsearch_service.sh
+++ b/check_local_elasticsearch_service.sh
@@ -74,6 +74,14 @@ warn (){
    echo ""
 }
 
+warn_only_terminal () {
+   if $terminal ; then
+      echo ""
+      echo -e "\t[ \033[33m\033[1mWarning\033[m ]: $*"
+      echo ""
+   fi
+}
+
 info (){
    echo ""
    if $terminal ; then
@@ -141,6 +149,19 @@ is_number() {
    #return $([[ ! -z "${1##*[!0-9]*}" ]])
 }
 
+trim() {
+    local var="$*"
+    var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"   # remove trailing whitespace characters
+    echo -n "$var"
+}
+
+blank_line() {
+   if $terminal ; then
+      echo ""
+   fi
+}
+
 reboot_system() {
 
 #   content_type='Content-Type: text/plain;\n charset="utf-8"'
@@ -257,11 +278,9 @@ if [[ ${#CONFLICTING_SCRIPTS} -gt 0 ]] ; then
 
       if $_stop_running ; then
 
-         echo ""
-         echo "[ Error ]: The \"${_script_name}\" script is currently running, but it conflicts with this script."
-         echo ""
-         echo "           Exiting now.."
-         echo ""
+         warn_only_terminal "\033[1m${_script_name}\033[m is currently running, but it conflicts with this script.
+
+                      Exiting now.."
 
          clean_up 1
 
diff --git a/check_local_mattermost_service.sh b/check_local_mattermost_service.sh
index cb6f0e0..cfa892a 100755
--- a/check_local_mattermost_service.sh
+++ b/check_local_mattermost_service.sh
@@ -74,6 +74,14 @@ warn (){
    echo ""
 }
 
+warn_only_terminal () {
+   if $terminal ; then
+      echo ""
+      echo -e "   [ \033[33m\033[1mWarning\033[m ]: $*"
+      echo ""
+   fi
+}
+
 info (){
    echo ""
    if $terminal ; then
@@ -141,6 +149,19 @@ is_number() {
    #return $([[ ! -z "${1##*[!0-9]*}" ]])
 }
 
+trim() {
+    local var="$*"
+    var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"   # remove trailing whitespace characters
+    echo -n "$var"
+}
+
+blank_line() {
+   if $terminal ; then
+      echo ""
+   fi
+}
+
 reboot_system() {
 
 #   content_type='Content-Type: text/plain;\n charset="utf-8"'
@@ -257,11 +278,9 @@ if [[ ${#CONFLICTING_SCRIPTS} -gt 0 ]] ; then
 
       if $_stop_running ; then
 
-         echo ""
-         echo "[ Error ]: The \"${_script_name}\" script is currently running, but it conflicts with this script."
-         echo ""
-         echo "           Exiting now.."
-         echo ""
+         warn_only_terminal "\033[1m${_script_name}\033[m is currently running, but it conflicts with this script.
+
+                      Exiting now.."
 
          clean_up 1
 
diff --git a/check_local_webservice.sh b/check_local_webservice.sh
index 66719c8..e9fc109 100755
--- a/check_local_webservice.sh
+++ b/check_local_webservice.sh
@@ -74,6 +74,14 @@ warn (){
    echo ""
 }
 
+warn_only_terminal () {
+   if $terminal ; then
+      echo ""
+      echo -e "\t[ \033[33m\033[1mWarning\033[m ]: $*"
+      echo ""
+   fi
+}
+
 echo_done() {
    if $terminal && $LOGGING ; then
       echo -e "\033[75G[ \033[32mdone\033[m ]"
@@ -121,6 +129,19 @@ is_number() {
    #return $([[ ! -z "${1##*[!0-9]*}" ]])
 }
 
+trim() {
+    local var="$*"
+    var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"   # remove trailing whitespace characters
+    echo -n "$var"
+}
+
+blank_line() {
+   if $terminal ; then
+      echo ""
+   fi
+}
+
 reboot_system() {
 
 #   content_type='Content-Type: text/plain;\n charset="utf-8"'
@@ -240,11 +261,9 @@ if [[ ${#CONFLICTING_SCRIPTS} -gt 0 ]] ; then
 
       if $_stop_running ; then
 
-         echo ""
-         echo "[ Error ]: The \"${_script_name}\" script is currently running, but it conflicts with this script."
-         echo ""
-         echo "           Exiting now.."
-         echo ""
+         warn_only_terminal "\033[1m${_script_name}\033[m is currently running, but it conflicts with this script.
+
+                      Exiting now.."
 
          clean_up 1