From d1ace176323fa63bd5156bf069d31eaabda611a7 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Fri, 7 Nov 2014 23:00:49 +0100 Subject: [PATCH] general support for apache 2.4, MKWS-332 --- test/bin/apache-template-update | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update index db0c6e5..1d57632 100755 --- a/test/bin/apache-template-update +++ b/test/bin/apache-template-update @@ -28,9 +28,6 @@ case $(uname) in Linux ) MKWS_OS=debian if [ -e /etc/debian_version ]; then MKWS_OS=debian - if $apache2 -v | egrep -q 'Server version: Apache/2\.4\.'; then - APACHE_VERSION=2.4 - fi fi if [ -e /etc/redhat-release ]; then MKWS_OS=centos @@ -39,6 +36,10 @@ case $(uname) in * ) MKWS_OS=debian ;; esac +if $apache2 -v | egrep -q 'Server version: Apache/2\.4\.'; then + APACHE_VERSION=2.4 +fi + if [ "$APACHE_VERSION" = "2.4" ]; then : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-$APACHE_VERSION"} -- 1.7.10.4