You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
117 lines
4.5 KiB
117 lines
4.5 KiB
diff -up ShellCheck-0.3.5/ShellCheck.cabal.orig ShellCheck-0.3.5/ShellCheck.cabal
|
|
--- ShellCheck-0.3.5/ShellCheck.cabal.orig 2015-01-29 00:11:08.454696154 +0900
|
|
+++ ShellCheck-0.3.5/ShellCheck.cabal 2015-01-29 00:20:26.583236331 +0900
|
|
@@ -41,8 +41,7 @@ library
|
|
json,
|
|
mtl,
|
|
parsec,
|
|
- regex-compat,
|
|
- QuickCheck >= 2.7.4
|
|
+ regex-compat
|
|
exposed-modules:
|
|
ShellCheck.Analytics
|
|
ShellCheck.AST
|
|
@@ -63,8 +62,7 @@ executable shellcheck
|
|
mtl,
|
|
parsec,
|
|
regex-compat,
|
|
- transformers,
|
|
- QuickCheck >= 2.7.4
|
|
+ transformers
|
|
main-is: shellcheck.hs
|
|
|
|
test-suite test-shellcheck
|
|
diff -up ShellCheck-0.3.5/ShellCheck/Analytics.hs.orig ShellCheck-0.3.5/ShellCheck/Analytics.hs
|
|
--- ShellCheck-0.3.5/ShellCheck/Analytics.hs.orig 2014-11-10 09:58:27.000000000 +0900
|
|
+++ ShellCheck-0.3.5/ShellCheck/Analytics.hs 2015-01-29 00:18:16.554343457 +0900
|
|
@@ -15,8 +15,7 @@
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
-}
|
|
-{-# LANGUAGE TemplateHaskell #-}
|
|
-module ShellCheck.Analytics (AnalysisOptions(..), defaultAnalysisOptions, filterByAnnotation, runAnalytics, shellForExecutable, runTests) where
|
|
+module ShellCheck.Analytics (AnalysisOptions(..), defaultAnalysisOptions, filterByAnnotation, runAnalytics, shellForExecutable) where
|
|
|
|
import Control.Arrow (first)
|
|
import Control.Monad
|
|
@@ -31,10 +30,9 @@ import Debug.Trace
|
|
import ShellCheck.AST
|
|
import ShellCheck.Options
|
|
import ShellCheck.Data
|
|
-import ShellCheck.Parser hiding (runTests)
|
|
+import ShellCheck.Parser
|
|
import Text.Regex
|
|
import qualified Data.Map as Map
|
|
-import Test.QuickCheck.All (quickCheckAll)
|
|
|
|
data Parameters = Parameters {
|
|
variableFlow :: [StackData],
|
|
@@ -3011,7 +3009,3 @@ checkFindActionPrecedence params = check
|
|
param <- getLiteralString t
|
|
return $ param `elem` strs
|
|
warnFor t = warn (getId t) 2146 "This action ignores everything before the -o. Use \\( \\) to group."
|
|
-
|
|
-return []
|
|
-runTests = $quickCheckAll
|
|
-
|
|
diff -up ShellCheck-0.3.5/ShellCheck/Parser.hs.orig ShellCheck-0.3.5/ShellCheck/Parser.hs
|
|
--- ShellCheck-0.3.5/ShellCheck/Parser.hs.orig 2014-11-10 09:58:27.000000000 +0900
|
|
+++ ShellCheck-0.3.5/ShellCheck/Parser.hs 2015-01-29 00:18:46.037319167 +0900
|
|
@@ -15,8 +15,8 @@
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
-}
|
|
-{-# LANGUAGE NoMonomorphismRestriction, TemplateHaskell #-}
|
|
-module ShellCheck.Parser (Note(..), Severity(..), parseShell, ParseResult(..), ParseNote(..), sortNotes, noteToParseNote, runTests, readScript) where
|
|
+{-# LANGUAGE NoMonomorphismRestriction #-}
|
|
+module ShellCheck.Parser (Note(..), Severity(..), parseShell, ParseResult(..), ParseNote(..), sortNotes, noteToParseNote, readScript) where
|
|
|
|
import ShellCheck.AST
|
|
import ShellCheck.Data
|
|
@@ -33,7 +33,6 @@ import Prelude hiding (readList)
|
|
import System.IO
|
|
import Text.Parsec.Error
|
|
import GHC.Exts (sortWith)
|
|
-import Test.QuickCheck.All (quickCheckAll)
|
|
|
|
backslash = char '\\'
|
|
linefeed = optional carriageReturn >> char '\n'
|
|
@@ -2137,7 +2136,3 @@ parseShell filename contents =
|
|
|
|
lt x = trace (show x) x
|
|
ltt t = trace (show t)
|
|
-
|
|
-return []
|
|
-runTests = $quickCheckAll
|
|
-
|
|
diff -up ShellCheck-0.3.5/ShellCheck/Simple.hs.orig ShellCheck-0.3.5/ShellCheck/Simple.hs
|
|
--- ShellCheck-0.3.5/ShellCheck/Simple.hs.orig 2015-01-29 00:11:08.456696153 +0900
|
|
+++ ShellCheck-0.3.5/ShellCheck/Simple.hs 2015-01-29 00:19:39.305275281 +0900
|
|
@@ -15,15 +15,13 @@
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
-}
|
|
-{-# LANGUAGE TemplateHaskell #-}
|
|
-module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage, runTests) where
|
|
+module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage) where
|
|
|
|
import Data.List
|
|
import Data.Maybe
|
|
-import ShellCheck.Analytics hiding (runTests)
|
|
+import ShellCheck.Analytics
|
|
import ShellCheck.Options
|
|
-import ShellCheck.Parser hiding (runTests)
|
|
-import Test.QuickCheck.All (quickCheckAll)
|
|
+import ShellCheck.Parser
|
|
import Text.Parsec.Pos
|
|
|
|
shellCheck :: AnalysisOptions -> String -> [ShellCheckComment]
|
|
@@ -71,7 +69,3 @@ prop_commentDisablesAnalysisIssue2 =
|
|
|
|
prop_optionDisablesIssue1 =
|
|
null $ shellCheck (defaultAnalysisOptions { optionExcludes = [2086, 2148] }) "echo $1"
|
|
-
|
|
-return []
|
|
-runTests = $quickCheckAll
|
|
-
|