Avoid using "grep -q" outside of GNU/Linux specific utilities.

According to the Autoconf manual, "grep -q" is not portable, so instead
redirect stdout to /dev/null.

diff --git a/Makefile.am b/Makefile.am
index 8517b2b8432477bffb1a22143b21fef7dea59993..457513cb9dd8853efe892c0860ef38f09022f779 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,7 @@ SUFFIXES += .in
                 -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
                 -e 's,[@]ovsdbmonitordir[@],$(ovsdbmonitordir),g' \
             > $@.tmp
-       @if head -n 1 $@.tmp | grep -q '#!'; then \
+       @if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
            echo chmod +x $@.tmp; \
            chmod +x $@.tmp; \
        fi

diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at
index 7f09d3494ed4a4d29eb8167a03092822a6c00e9a..c2ec881032cadfcbbfd18cb30a800f3a730fb649 100644 (file)
--- a/tests/ovsdb-tool.at
+++ b/tests/ovsdb-tool.at
@@ -45,7 +45,7 @@ AT_CHECK([[ovsdb-tool transact db '
 AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0],
  [[[{"uuid":["uuid","<0>"]},{}]
 ]])
-AT_CHECK([grep -q "add row for 5" db])
+AT_CHECK([grep "add row for 5" db], [0], [ignore])
 AT_CLEANUP
 
 AT_SETUP([ovsdb-tool compact])

diff --git a/utilities/ovs-pki.in b/utilities/ovs-pki.in
index 1f5286908c32b16ba5650b4df248a76d8829535d..9a55961fe3641746ebb02e229220bda99eb1fc66 100755 (executable)
--- a/utilities/ovs-pki.in
+++ b/utilities/ovs-pki.in
@@ -361,7 +361,7 @@ fingerprint() {
     file=$1
     name=${1-$2}
     date=$(date -r $file)
-    if grep -q -e '-BEGIN CERTIFICATE-' "$file"; then
+    if grep -e '-BEGIN CERTIFICATE-' "$file" > /dev/null; then
         fingerprint=$(openssl x509 -noout -in "$file" -fingerprint |
                       sed 's/SHA1 Fingerprint=//' | tr -d ':')
     else