X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fbin%2Fapache-template-update;h=1d576323b743b420d51568e60c59af026044e3e1;hb=bceda32ec4c5aaed6ce3e244aedc0ee47292ef97;hp=db0c6e5c226bc08d57b4b25f4a42c0c82d6cea3b;hpb=71a3bc5e72fdcf2a51c3d32f10b8248c0ac5399c;p=mkws-moved-to-github.git 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"}