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

Merge pull request #1906 from josephcsible/shellsupport 

Simplify ShellSupport
This commit is contained in:
Vidar Holen 2020-04-12 15:22:52 -07:00 committed by GitHub
parent 58d3e50f43 8a6679fd8a
commit 30523555af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ShellCheck/Checks/ShellSupport.hs
View File

@ -289,10 +289,11 @@ checkBashisms = ForShell [Sh, Dash] $ \t -> do
-- Get the literal options from a list of arguments, -- Get the literal options from a list of arguments,
-- up until the first non-literal one -- up until the first non-literal one
getLiteralArgs :: [Token] -> [(Id, String)] getLiteralArgs :: [Token] -> [(Id, String)]
getLiteralArgs (first:rest) = fromMaybe [] $ do getLiteralArgs = foldr go []
str <- getLiteralString first where
return $ (getId first, str) : getLiteralArgs rest go first rest = case getLiteralString first of
getLiteralArgs [] = [] Just str -> (getId first, str) : rest
Nothing -> []
-- Check a flag-option pair (such as -o errexit) -- Check a flag-option pair (such as -o errexit)
checkOptions (flag@(fid,flag') : opt@(oid,opt') : rest) checkOptions (flag@(fid,flag') : opt@(oid,opt') : rest)
@ -390,11 +391,10 @@ checkBashisms = ForShell [Sh, Dash] $ \t -> do
("unset", Just ["f", "v"]), ("unset", Just ["f", "v"]),
("wait", Just []) ("wait", Just [])
] ]
bashism t@(T_SourceCommand id src _) = bashism t@(T_SourceCommand id src _)
let name = fromMaybe "" $ getCommandName src | getCommandName src == Just "source" = warnMsg id "'source' in place of '.' is"
in when (name == "source") $ warnMsg id "'source' in place of '.' is" bashism (TA_Expansion _ (T_Literal id str : _))
bashism (TA_Expansion _ (T_Literal id str : _)) | str `matches` radix = | str `matches` radix = warnMsg id "arithmetic base conversion is"
when (str `matches` radix) $ warnMsg id "arithmetic base conversion is"
where where
radix = mkRegex "^[0-9]+#" radix = mkRegex "^[0-9]+#"
bashism _ = return () bashism _ = return ()