7x31
/
shellcheck
mirror of https://github.com/koalaman/shellcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed quoted ~ warning to only trigger for ~/

This commit is contained in:
Vidar Holen 2015-03-07 23:48:01 -08:00
parent dcc10bbdf6
commit 0a2cf208c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ShellCheck/Analytics.hs
View File

@ -1852,7 +1852,7 @@ prop_checkTildeInQuotes5 = verifyNot checkTildeInQuotes "echo '/~foo/cow'"
prop_checkTildeInQuotes6 = verifyNot checkTildeInQuotes "awk '$0 ~ /foo/'" prop_checkTildeInQuotes6 = verifyNot checkTildeInQuotes "awk '$0 ~ /foo/'"
checkTildeInQuotes _ = check checkTildeInQuotes _ = check
where where
verify id ('~':_) = warn id 2088 "Note that ~ does not expand in quotes." verify id ('~':'/':_) = warn id 2088 "Note that ~ does not expand in quotes."
verify _ _ = return () verify _ _ = return ()
check (T_NormalWord _ (T_SingleQuoted id str:_)) = check (T_NormalWord _ (T_SingleQuoted id str:_)) =
verify id str verify id str

2
ShellCheck/Parser.hs
View File

@ -950,7 +950,7 @@ readNormalEscaped = called "escaped char" $ do
pos <- getPosition pos <- getPosition
backslash backslash
do do
next <- quotable <|> oneOf "?*@!+[]{}.," next <- quotable <|> oneOf "?*@!+[]{}.,~"
return $ if next == '\n' then "" else [next] return $ if next == '\n' then "" else [next]
<|> <|>
do do