occ_maintenance.sh

@@ -139,11 +139,13 @@ error(){
 }
 
 warn (){
+   echo ""
    if $terminal ; then
-      echo ""
       echo -e "   [ \033[33m\033[1mWarning\033[m ]: $*"
-      echo ""
+   else
+      echo "   [ Warning ]: $*"
    fi
+   echo ""
 }
 
 info (){
@@ -179,14 +181,6 @@ blank_line() {
 
 
 
-# - Running in a terminal?
-# -
-if [[ -t 1 ]] ; then
-   terminal=true
-else
-   terminal=false
-fi
-
 # ----------
 # - Jobhandling 
 # ----------
@@ -227,14 +221,6 @@ 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
 
 
@@ -248,9 +234,9 @@ DEFAULT_HTTP_GROUP="www-data"
 DEFAULT_PHP_ENGINE='FPM'
 
 echo ""
-echononl "   Include Configuration file '$(basename "${conf_file}")'.."
+echononl "   Include Configuration file.."
 if [[ ! -f $conf_file ]]; then
-   echo_skipped
+   echo_failed
    fatal "Missing configuration file '$conf_file'."
 else
    source $conf_file
@@ -285,6 +271,14 @@ else
    SYSTEMD_EXISTS=true
 fi
 
+# - Running in a terminal?
+# -
+if [[ -t 1 ]] ; then
+   terminal=true
+else
+   terminal=false
+fi
+
 #clear
 
 if $terminal ; then

occ_manual_upgrade.sh

@@ -234,7 +234,7 @@ DEFAULT_HTTP_GROUP="www-data"
 DEFAULT_PHP_ENGINE='FPM'
 
 echo ""
-echononl "   Include Configuration file '$(basename "${conf_file}")'.."
+echononl "   Include Configuration file.."
 if [[ ! -f $conf_file ]]; then
    echo_failed
    fatal "Missing configuration file '$conf_file'."