From 3449e6be215dc3d2ec05032dcfc282897a49e836 Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sat, 1 Feb 2020 22:50:13 -0500 Subject: [PATCH] Get rid of our getOpt, as it already exists as lookup --- src/ShellCheck/Analytics.hs | 2 +- src/ShellCheck/AnalyzerLib.hs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ShellCheck/Analytics.hs b/src/ShellCheck/Analytics.hs index 64a71a3..e8bee4f 100644 --- a/src/ShellCheck/Analytics.hs +++ b/src/ShellCheck/Analytics.hs @@ -2840,7 +2840,7 @@ checkReadWithoutR _ t@T_SimpleCommand {} | t `isUnqualifiedCommand` "read" = flags = getAllFlags t has_t0 = fromMaybe False $ do parsed <- getOpts flagsForRead flags - t <- getOpt "t" parsed + t <- lookup "t" parsed str <- getLiteralString t return $ str == "0" diff --git a/src/ShellCheck/AnalyzerLib.hs b/src/ShellCheck/AnalyzerLib.hs index 590889c..e93758f 100644 --- a/src/ShellCheck/AnalyzerLib.hs +++ b/src/ShellCheck/AnalyzerLib.hs @@ -960,8 +960,6 @@ getOpts string flags = process flags more <- process rest2 return $ (flag1, token1) : more -getOpt str flags = snd <$> (listToMaybe $ filter (\(f, _) -> f == str) $ flags) - supportsArrays shell = shell == Bash || shell == Ksh -- Returns true if the shell is Bash or Ksh (sorry for the name, Ksh)