From 7aa2b93d2161a0a7249da1f7fcdace63ee2528c3 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 23 Jun 2023 14:08:00 +0200
Subject: [PATCH] install_httpd-2.4.sh: some minor changes on script output..

---
 install_httpd-2.4.sh | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/install_httpd-2.4.sh b/install_httpd-2.4.sh
index c78a710..06cd30d 100755
--- a/install_httpd-2.4.sh
+++ b/install_httpd-2.4.sh
@@ -226,6 +226,18 @@ fatal(){
    clean_up 1
 }
 
+info (){
+   echo ""
+   echo -e "\t[ \033[32m\033[1mInfo\033[m ]: $*"
+   echo ""
+}
+
+error (){
+   echo ""
+   echo -e "\t[ \033[31m\033[1mError\033[m ]: $*"
+   echo ""
+}
+
 warn (){
    echo ""
    echo -e "\t[ \033[33m\033[1mWarning\033[m ]: $*"
@@ -305,8 +317,17 @@ trap clean_up SIGHUP SIGINT SIGTERM
 # -
 detect_os_1
 
+#clear
+# Detect OpenSSL version
+#
+get_openssl_version
+if [[ $? -ne 0 ]] ; then
+
+   error "Cannot detect OpenSSL Version."
+
+fi
+
 
-clear
 echo
 echo -e "\033[21G\033[32mInstallation script apache webserver \033[m"
 echo
@@ -859,7 +880,7 @@ fi
 
 
 
-clear
+#clear
 echo ""
 echo -e "\033[21G\033[32mStart Apache Webserver Installation with the following Parameters \033[m"
 echo ""
@@ -2332,7 +2353,8 @@ if [[ ${OPENSSL_MAJOR_VERSION} -gt 1 ]]; then
    if [[ -f "${_srcdir}/dhparam-openssl-3.0-4096.pem" ]] ; then
       echo "## - Copy dhparam.pem to '$PREFIX/conf/ssl/dhparam.pem'.." >> ${_logdir}/main.log
       echo "## -" >> ${_logdir}/main.log
-      echo "cp \"${_srcdir}/dhparam-openssl-3.0-4096.pem\" \"$PREFIX/conf/ssl/dhparam.pem\""
+      echo -e "\tcp \"${_srcdir}/dhparam-openssl-3.0-4096.pem\".."
+      echononl "\t   to \"$PREFIX/conf/ssl/dhparam.pem\""
       cp "${_srcdir}/dhparam-openssl-3.0-4096.pem" "$PREFIX/conf/ssl/dhparam.pem" >> ${_logdir}/main.log
       if [[ $? -eq 0 ]];then
          echo_ok