From 66cebe7c7b9562b95609ba11c3e45769d7d8e1c8 Mon Sep 17 00:00:00 2001
From: Vidar Holen <spam@vidarholen.net>
Date: Thu, 4 Jul 2013 13:49:00 -0700
Subject: [PATCH] Don't warn about quoting when $var is the command name.

---
 ShellCheck/Analytics.hs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ShellCheck/Analytics.hs b/ShellCheck/Analytics.hs
index 7b417f9..92c383e 100644
--- a/ShellCheck/Analytics.hs
+++ b/ShellCheck/Analytics.hs
@@ -1383,8 +1383,7 @@ doVariableFlowAnalysis readFunc writeFunc empty t = fst $ runState (
         writeFunc base token name values
     doFlow _ = return []
 
----- Spacefulness detection
-
+---- Check whether variables could have spaces/globs
 prop_checkSpacefulness0 = verifyFull checkSpacefulness "for f in *.mp3; do echo $f; done"
 prop_checkSpacefulness1 = verifyFull checkSpacefulness "a='cow moo'; echo $a"
 prop_checkSpacefulness2 = verifyNotFull checkSpacefulness "a='cow moo'; [[ $a ]]"
@@ -1403,6 +1402,7 @@ prop_checkSpacefulnessE = verifyNotFull checkSpacefulness "foo=$3 env"
 prop_checkSpacefulnessF = verifyNotFull checkSpacefulness "local foo=$1"
 prop_checkSpacefulnessG = verifyNotFull checkSpacefulness "declare foo=$1"
 prop_checkSpacefulnessH = verifyFull checkSpacefulness "echo foo=$1"
+prop_checkSpacefulnessI = verifyNotFull checkSpacefulness "$1 --flags"
 
 checkSpacefulness t =
     doVariableFlowAnalysis readF writeF (Map.fromList defaults) t
@@ -1418,7 +1418,9 @@ checkSpacefulness t =
 
     readF _ token name = do
         spaced <- hasSpaces name
-        if spaced && (not $ inUnquotableContext parents token)
+        if spaced 
+          && (not $ inUnquotableContext parents token) 
+          && (not $ usedAsCommandName parents token)
             then return [(getId token, Note InfoC warning)]
             else return []
       where