[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5339/8267] autotools.bbclass: Replace "grep ... >/dev/null" with "grep -q"



commit 6b210e74b7f7d622c95428210fc641788af29266
Author: Robert P. J. Day <rpjday crashcourse ca>
Date:   Sun Mar 26 06:24:07 2017 -0400

    autotools.bbclass: Replace "grep ... >/dev/null" with "grep -q"
    
    For aesthetic style reasons, use "grep -q" instead of ">/dev/null".
    
    (From OE-Core rev: 39a7bfde92211b3546ff0a8e6a3e549714996b28)
    
    Signed-off-by: Robert P. J. Day <rpjday crashcourse ca>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/autotools.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index d494734..ac04a07 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -193,14 +193,14 @@ autotools_do_configure() {
                else
                        CONFIGURE_AC=configure.ac
                fi
-               if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-                       if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
+               if grep -q "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC; then
+                       if grep -q "sed.*POTFILES" $CONFIGURE_AC; then
                                : do nothing -- we still have an old unmodified configure.ac
                        else
                                bbnote Executing glib-gettextize --force --copy
                                echo "no" | glib-gettextize --force --copy
                        fi
-               elif grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+               elif grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then
                        # We'd call gettextize here if it wasn't so broken...
                        cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
                        if [ -d ${S}/po/ ]; then
@@ -212,7 +212,7 @@ autotools_do_configure() {
                        PRUNE_M4="$PRUNE_M4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 
po.m4 progtest.m4"
                fi
                mkdir -p m4
-               if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
+               if grep -q "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC; then
                        if ! echo "${DEPENDS}" | grep -q intltool-native; then
                                bbwarn "Missing DEPENDS on intltool-native"
                        fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]