From 3872865f3daeea12268393eff2c8e9f0a2a7a4d0 Mon Sep 17 00:00:00 2001
From: Michael Elkins <melkins@tislabs.com>
Date: Thu, 14 Mar 2013 23:15:58 +0000
Subject: fix test for existance of inclusion of apache.conf in
 rpki-ca.postinst

closes #469

svn path=/trunk/; revision=5156
---
 buildtools/debian-skeleton/rpki-ca.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buildtools')

diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst
index 57d0872c..68daa7b7 100644
--- a/buildtools/debian-skeleton/rpki-ca.postinst
+++ b/buildtools/debian-skeleton/rpki-ca.postinst
@@ -24,7 +24,7 @@ setup_apache() {
     f=/etc/apache2/sites-available/default-ssl
     conf=/etc/rpki/apache.conf
     cmd=no
-    if test "x$(grep -q "[^#]*Include $conf" $f)" = "x"
+    if test "$(grep "[^#]*Include $conf" $f 2>/dev/null)" = ""
     then
         awk < $f > ${f}.tmp -v conf=$conf '
 	    $0 ~ /[^#]*<\/VirtualHost>/ { print "Include", conf }
-- 
cgit v1.2.3