From 96168fc707380c984e0f5a26062c2ed00ddd46cc Mon Sep 17 00:00:00 2001
From: Scorpiokat <katerina.efimova@gmail.com>
Date: Mon, 2 Jan 2017 18:01:24 +0000
Subject: [PATCH] This commit fixes #797
---
ShellCheck/Analytics.hs | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/ShellCheck/Analytics.hs b/ShellCheck/Analytics.hs
index 017f4bc..f1be786 100644
--- a/ShellCheck/Analytics.hs
+++ b/ShellCheck/Analytics.hs
@@ -328,6 +328,12 @@ prop_checkPipePitfalls6 = verify checkPipePitfalls "find . | xargs foo"
prop_checkPipePitfalls7 = verifyNot checkPipePitfalls "find . -printf '%s\\n' | xargs foo"
prop_checkPipePitfalls8 = verify checkPipePitfalls "foo | grep bar | wc -l"
prop_checkPipePitfalls9 = verifyNot checkPipePitfalls "foo | grep -o bar | wc -l"
+prop_checkPipePitfalls10 = verifyNot checkPipePitfalls "foo | grep -o bar | wc"
+prop_checkPipePitfalls11 = verifyNot checkPipePitfalls "foo | grep bar | wc"
+prop_checkPipePitfalls12 = verifyNot checkPipePitfalls "foo | grep -o bar | wc -c"
+prop_checkPipePitfalls13 = verifyNot checkPipePitfalls "foo | grep bar | wc -c"
+prop_checkPipePitfalls14 = verifyNot checkPipePitfalls "foo | grep -o bar | wc -cmwL"
+prop_checkPipePitfalls15 = verifyNot checkPipePitfalls "foo | grep bar | wc -cmwL"
checkPipePitfalls _ (T_Pipeline id _ commands) = do
for ["find", "xargs"] $
\(find:xargs:_) ->
@@ -349,10 +355,11 @@ checkPipePitfalls _ (T_Pipeline id _ commands) = do
for ["grep", "wc"] $
\(grep:wc:_) ->
- let flags = fromMaybe [] $ map snd <$> getAllFlags <$> getCommand grep
+ let flagsGrep = fromMaybe [] $ map snd <$> getAllFlags <$> getCommand grep
+ flagsWc = fromMaybe [] $ map snd <$> getAllFlags <$> getCommand wc
in
- unless (any (`elem` ["o", "only-matching"]) flags) $
- style (getId grep) 2126 "Consider using grep -c instead of grep|wc."
+ unless ((any (`elem` ["o", "only-matching"]) flagsGrep) || (any (`elem` ["m", "chars", "w", "words", "c", "bytes", "L", "max-line-length"]) flagsWc) || ((length flagsWc) == 0)) $
+ style (getId grep) 2126 "Consider using grep -c instead of grep|wc -l."
didLs <- liftM or . sequence $ [
for' ["ls", "grep"] $