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

Remove unnecessary use of Maybe from shellFor

This commit is contained in:
Joseph C. Sible 2020-12-28 16:22:53 -05:00
parent bd3299edd3
commit 35033a9f2f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ShellCheck/AnalyzerLib.hs
View File

@ -258,9 +258,9 @@ determineShell fallbackShell t = fromMaybe Bash $
executableFromShebang :: String -> String executableFromShebang :: String -> String
executableFromShebang = shellFor executableFromShebang = shellFor
where where
shellFor s | "/env " `isInfixOf` s = fromMaybe "" $ do shellFor s | "/env " `isInfixOf` s = case matchRegex re s of
[flag, shell] <- matchRegex re s Just [flag, shell] -> shell
return shell _ -> ""
shellFor s | ' ' `elem` s = shellFor $ takeWhile (/= ' ') s shellFor s | ' ' `elem` s = shellFor $ takeWhile (/= ' ') s
shellFor s = reverse . takeWhile (/= '/') . reverse $ s shellFor s = reverse . takeWhile (/= '/') . reverse $ s
re = mkRegex "/env +(-S|--split-string=?)? *([^ ]*)" re = mkRegex "/env +(-S|--split-string=?)? *([^ ]*)"