From 86a4da1acacfdf3c323fc53c4049d9b510a9a9e3 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Mon, 19 Jun 2023 01:20:03 +0200
Subject: [PATCH] install_httpd-2.4.sh; support detection of installed OS and
 concerning version.

---
 install_httpd-2.4.sh | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/install_httpd-2.4.sh b/install_httpd-2.4.sh
index 95c017f..e181831 100755
--- a/install_httpd-2.4.sh
+++ b/install_httpd-2.4.sh
@@ -247,12 +247,47 @@ echo_failed(){
 echo_skipped() {
    echo -e "\033[75G[ \033[33m\033[1mskipped\033[m ]"
 }
+
+detect_os_1 () {
+
+   if $(which lsb_release > /dev/null 2>&1) ; then
+
+      os_dist="$(lsb_release -i | awk '{print tolower($3)}')"
+      os_version="$(lsb_release -r | awk '{print tolower($2)}')"
+      os_codename="$(lsb_release -c | awk '{print tolower($2)}')"
+
+      if [[ "$os_dist" = "debian" ]]; then
+         if $(echo "$os_version" | grep -q '\.') ; then
+            os_version=$(echo "$os_version" | cut --delimiter='.' -f1)
+         fi
+      fi
+
+   elif [[ -e "/etc/os-release" ]]; then
+
+      . /etc/os-release
+
+      os_dist=$ID
+      os_version=${os_version_ID}
+
+   fi
+
+   # remove whitespace from os_dist and os_version
+   os_dist="${os_dist// /}"
+   os_version="${os_version// /}"
+
+}
 ## ---
 ## --- END: functions
 
 
 trap clean_up SIGHUP SIGINT SIGTERM
 
+# - Set variable
+# -    os_dist
+# -    os_version
+# -    os_codename
+# -
+detect_os_1
 
 
 clear
@@ -2277,7 +2312,7 @@ fi
 echo "" >> ${_logdir}/main.log
 if [[ "$os_dist" = "debian" ]] && [[ $os_version -gt 11 ]]; then
 
-   if [[ -f "dhparam-openssl-3.0-4096.pem" ]] ; then
+   if [[ -f "${_builddir}/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 \"${_builddir}/dhparam-openssl-3.0-4096.pem\" \"$PREFIX/conf/ssl/dhparam.pem\""