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

Fixed some incorrect warnings for PS1 escapes.

This commit is contained in:
Vidar Holen 2013-07-05 19:12:13 -07:00
parent 76c5af2973
commit 56e0119db1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ShellCheck/Analytics.hs
View File

@ -1071,6 +1071,8 @@ prop_checkPS14 = verify checkPS1Assignments "PS1=$'\\e[3m; '"
prop_checkPS14a= verify checkPS1Assignments "export PS1=$'\\e[3m; '" prop_checkPS14a= verify checkPS1Assignments "export PS1=$'\\e[3m; '"
prop_checkPS15 = verifyNot checkPS1Assignments "PS1='\\[\\033[1;35m\\]\\$ '" prop_checkPS15 = verifyNot checkPS1Assignments "PS1='\\[\\033[1;35m\\]\\$ '"
prop_checkPS16 = verifyNot checkPS1Assignments "PS1='\\[\\e1m\\e[1m\\]\\$ '" prop_checkPS16 = verifyNot checkPS1Assignments "PS1='\\[\\e1m\\e[1m\\]\\$ '"
prop_checkPS17 = verifyNot checkPS1Assignments "PS1='e033x1B'"
prop_checkPS18 = verifyNot checkPS1Assignments "PS1='\\[\\e\\]'"
checkPS1Assignments t = checkPS1Assignments t =
case t of case t of
(T_Assignment _ "PS1" word) -> warnFor [word] (T_Assignment _ "PS1" word) -> warnFor [word]
@ -1088,7 +1090,7 @@ checkPS1Assignments t =
let unenclosed = subRegex enclosedRegex s "" in let unenclosed = subRegex enclosedRegex s "" in
isJust $ matchRegex escapeRegex unenclosed isJust $ matchRegex escapeRegex unenclosed
enclosedRegex = mkRegex "\\\\\\[.*\\\\\\]" -- FIXME: shouldn't be eager enclosedRegex = mkRegex "\\\\\\[.*\\\\\\]" -- FIXME: shouldn't be eager
escapeRegex = mkRegex "\\x1[Bb]|\\e|\x1B|\\033" escapeRegex = mkRegex "\\\\x1[Bb]|\\\\e|\x1B|\\\\033"
prop_checkBackticks1 = verify checkBackticks "echo `foo`" prop_checkBackticks1 = verify checkBackticks "echo `foo`"
prop_checkBackticks2 = verifyNot checkBackticks "echo $(foo)" prop_checkBackticks2 = verifyNot checkBackticks "echo $(foo)"

2
ShellCheck/Parser.hs
View File

@ -829,7 +829,7 @@ readGenericLiteral1 endExp = do
readGenericEscaped = do readGenericEscaped = do
backslash backslash
x <- anyChar x <- anyChar
return $ if x == '\n' then [] else [x] return $ if x == '\n' then [] else ['\\', x]
prop_readBraced = isOk readBraced "{1..4}" prop_readBraced = isOk readBraced "{1..4}"
prop_readBraced2 = isOk readBraced "{foo,bar,\"baz lol\"}" prop_readBraced2 = isOk readBraced "{foo,bar,\"baz lol\"}"