intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: Daniel Vetter <daniel@ffwll.ch>, Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2] dim: use grep -q instead of grep|wc
Date: Tue, 21 Mar 2017 13:12:31 +0200	[thread overview]
Message-ID: <1490094751-1613-1-git-send-email-jani.nikula@intel.com> (raw)
In-Reply-To: <20170321104143.lbzgfzmt2bmup7en@phenom.ffwll.local>

Fix shellcheck SC2126: Consider using grep -c instead of grep|wc.

We can use -q as suggested by Daniel because we don't care about the
exact count.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 Makefile | 1 -
 dim      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 139fd82ba441..1f628e9489f9 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ SC_EXCLUDE := \
 	-e SC2086 \
 	-e SC2119 \
 	-e SC2120 \
-	-e SC2126 \
 	-e SC2143
 
 shellcheck:
diff --git a/dim b/dim
index d961bb493616..33b393d3f27a 100755
--- a/dim
+++ b/dim
@@ -502,7 +502,7 @@ function dim_rebuild_tip
 	rerere=$DIM_PREFIX/drm-rerere
 
 	cd $rerere
-	if [[ $(git status --porcelain | grep -v "^[ ?][ ?]" | wc -l) -gt 0 ]]; then
+	if git status --porcelain | grep -q -v "^[ ?][ ?]"; then
 		warn_or_fail "integration configuration file $integration_config not commited"
 	fi
 
-- 
2.1.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2017-03-21 11:12 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-21 10:14 [PATCH 0/8] dim: shellcheck v0.4.4 fixes Jani Nikula
2017-03-21 10:14 ` [PATCH 1/8] dim: declare and assign separately Jani Nikula
2017-03-21 10:14 ` [PATCH 2/8] dim: use [ p ] || [ q ] instead of test -a/-o Jani Nikula
2017-03-21 10:14 ` [PATCH 3/8] dim: use read -r option Jani Nikula
2017-03-21 10:14 ` [PATCH 4/8] dim: silence shellcheck warning about sourced files Jani Nikula
2017-03-21 10:14 ` [PATCH 5/8] dim: avoid errors with rm $foo/ expanding to / Jani Nikula
2017-03-21 10:40   ` Daniel Vetter
2017-03-21 11:15     ` Jani Nikula
2017-03-21 12:50       ` Daniel Vetter
2017-03-22 10:41         ` David Weinehall
2017-03-22 10:53           ` Jani Nikula
2017-03-22 13:51             ` David Weinehall
2017-03-22 14:03               ` Jani Nikula
2017-03-21 10:14 ` [PATCH 6/8] dim: pipe dim_cite output directly instead of using echo Jani Nikula
2017-03-21 10:14 ` [PATCH 7/8] dim: use grep -c instead of grep|wc Jani Nikula
2017-03-21 10:41   ` Daniel Vetter
2017-03-21 11:12     ` Jani Nikula [this message]
2017-03-21 10:14 ` [PATCH 8/8] dim: abstract -i interactive pause to a function Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1490094751-1613-1-git-send-email-jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=daniel@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).