From bea755c67049c131c0b8b3d87b5ddbdc35c4af1e Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 4 Aug 2023 01:28:23 +0200
Subject: [PATCH] occ_maintenance.sh: fix error determin configuration file.

---
 occ_maintenance.sh    | 34 ++++++++++++++++++++--------------
 occ_manual_upgrade.sh |  2 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/occ_maintenance.sh b/occ_maintenance.sh
index 1a8288e..56514a8 100755
--- a/occ_maintenance.sh
+++ b/occ_maintenance.sh
@@ -139,13 +139,11 @@ error(){
 }
 
 warn (){
-   echo ""
    if $terminal ; then
+      echo ""
       echo -e "   [ \033[33m\033[1mWarning\033[m ]: $*"
-   else
-      echo "   [ Warning ]: $*"
+      echo ""
    fi
-   echo ""
 }
 
 info (){
@@ -181,6 +179,14 @@ blank_line() {
 
 
 
+# - Running in a terminal?
+# -
+if [[ -t 1 ]] ; then
+   terminal=true
+else
+   terminal=false
+fi
+
 # ----------
 # - Jobhandling 
 # ----------
@@ -221,6 +227,14 @@ if [[ -z "$WEBSITE" ]] ; then
    source ${snippet_dir}/get-cloud-instance-to-update.sh
 
    #fatal "No website ios given on commandline - Missing Parameter '-s <website>'"
+else
+   while IFS='' read -r -d '' _conf_file ; do
+      if $(grep -E -q "WEBSITE=\"?${WEBSITE}\"?" ${_conf_file} 2> /dev/null) ; then
+         conf_file="${_conf_file}"
+         break
+      fi
+   done  < <(find "${conf_dir}" -maxdepth 1 -type f -name "*.conf" -print0)
+  # conf_file="${conf_dir}/${WEBSITE}.conf"
 fi
 
 
@@ -234,9 +248,9 @@ DEFAULT_HTTP_GROUP="www-data"
 DEFAULT_PHP_ENGINE='FPM'
 
 echo ""
-echononl "   Include Configuration file.."
+echononl "   Include Configuration file '$(basename "${conf_file}")'.."
 if [[ ! -f $conf_file ]]; then
-   echo_failed
+   echo_skipped
    fatal "Missing configuration file '$conf_file'."
 else
    source $conf_file
@@ -271,14 +285,6 @@ else
    SYSTEMD_EXISTS=true
 fi
 
-# - Running in a terminal?
-# -
-if [[ -t 1 ]] ; then
-   terminal=true
-else
-   terminal=false
-fi
-
 #clear
 
 if $terminal ; then
diff --git a/occ_manual_upgrade.sh b/occ_manual_upgrade.sh
index 85ba6d2..8447fb6 100755
--- a/occ_manual_upgrade.sh
+++ b/occ_manual_upgrade.sh
@@ -234,7 +234,7 @@ DEFAULT_HTTP_GROUP="www-data"
 DEFAULT_PHP_ENGINE='FPM'
 
 echo ""
-echononl "   Include Configuration file.."
+echononl "   Include Configuration file '$(basename "${conf_file}")'.."
 if [[ ! -f $conf_file ]]; then
    echo_failed
    fatal "Missing configuration file '$conf_file'."