Ajout support pour archives xz, et ajout fonction pour vérifier qu'on est bien l...

[hvlinux.git] / stage5 / pkg / apache

diff --git a/stage5/pkg/apache b/stage5/pkg/apache
index ab03860..37559e3 100644 (file)
--- a/stage5/pkg/apache
+++ b/stage5/pkg/apache
@@ -22,15 +22,13 @@ hvbuild_post()
     # There's a problem with the ISAPI DSO module caused from compiling with
     # GCC-4.1.2.
     # Commenting out the module from the configuration:
-    if grep "LoadModule isapi_module" /etc/apache/httpd.conf \
-        1> /dev/null 2>&1; then
+    if grep -q "LoadModule isapi_module" /etc/apache/httpd.conf; then
         sed -i -e "s/^LoadModule isapi_module/# &/" /etc/apache/httpd.conf
     fi
 
     # Modifying the listening port if an alternate one is specified.
     if [ -n "${HTTPD_PORT}" ]; then
-        if ! grep "Listen ${HTTPD_PORT}" /etc/apache/httpd.conf \
-            1> /dev/null 2>&1; then
+        if ! grep -q "Listen ${HTTPD_PORT}" /etc/apache/httpd.conf; then
             # Adding alternate port to default port of 80
            sed -i -e "s%\(Listen 80\)%\1\nListen ${HTTPD_PORT}%" \
                 /etc/apache/httpd.conf