bumped to version 0.3.7
This commit is contained in:
parent
da91416707
commit
6623277c29
|
@ -3,3 +3,4 @@
|
||||||
/v0.3.3.tar.gz
|
/v0.3.3.tar.gz
|
||||||
/ShellCheck-0.3.4.tar.gz
|
/ShellCheck-0.3.4.tar.gz
|
||||||
/ShellCheck-0.3.5.tar.gz
|
/ShellCheck-0.3.5.tar.gz
|
||||||
|
/ShellCheck-0.3.7.tar.gz
|
||||||
|
|
|
@ -1,74 +1,75 @@
|
||||||
diff -up ShellCheck-0.3.5/ShellCheck.cabal.orig ShellCheck-0.3.5/ShellCheck.cabal
|
diff --git i/ShellCheck.cabal w/ShellCheck.cabal
|
||||||
--- ShellCheck-0.3.5/ShellCheck.cabal.orig 2015-01-29 00:11:08.454696154 +0900
|
index 6e46dfe..8223f3a 100644
|
||||||
+++ ShellCheck-0.3.5/ShellCheck.cabal 2015-01-29 00:20:26.583236331 +0900
|
--- i/ShellCheck.cabal
|
||||||
@@ -41,8 +41,7 @@ library
|
+++ w/ShellCheck.cabal
|
||||||
|
@@ -43,8 +43,7 @@ library
|
||||||
json,
|
json,
|
||||||
mtl,
|
mtl,
|
||||||
parsec,
|
parsec,
|
||||||
- regex-compat,
|
- regex-tdfa,
|
||||||
- QuickCheck >= 2.7.4
|
- QuickCheck >= 2.7.4
|
||||||
+ regex-compat
|
+ regex-tdfa
|
||||||
exposed-modules:
|
exposed-modules:
|
||||||
ShellCheck.Analytics
|
ShellCheck.Analytics
|
||||||
ShellCheck.AST
|
ShellCheck.AST
|
||||||
@@ -63,8 +62,7 @@ executable shellcheck
|
@@ -66,8 +65,7 @@ executable shellcheck
|
||||||
mtl,
|
mtl,
|
||||||
parsec,
|
parsec,
|
||||||
regex-compat,
|
regex-tdfa,
|
||||||
- transformers,
|
- transformers,
|
||||||
- QuickCheck >= 2.7.4
|
- QuickCheck >= 2.7.4
|
||||||
+ transformers
|
+ transformers
|
||||||
main-is: shellcheck.hs
|
main-is: shellcheck.hs
|
||||||
|
|
||||||
test-suite test-shellcheck
|
test-suite test-shellcheck
|
||||||
diff -up ShellCheck-0.3.5/ShellCheck/Analytics.hs.orig ShellCheck-0.3.5/ShellCheck/Analytics.hs
|
diff --git i/ShellCheck/Analytics.hs w/ShellCheck/Analytics.hs
|
||||||
--- ShellCheck-0.3.5/ShellCheck/Analytics.hs.orig 2014-11-10 09:58:27.000000000 +0900
|
index fe2fcf4..80bc7a0 100644
|
||||||
+++ ShellCheck-0.3.5/ShellCheck/Analytics.hs 2015-01-29 00:18:16.554343457 +0900
|
--- i/ShellCheck/Analytics.hs
|
||||||
@@ -15,8 +15,7 @@
|
+++ w/ShellCheck/Analytics.hs
|
||||||
You should have received a copy of the GNU Affero General Public License
|
@@ -16,7 +16,7 @@
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-}
|
-}
|
||||||
-{-# LANGUAGE TemplateHaskell #-}
|
{-# LANGUAGE TemplateHaskell, FlexibleContexts #-}
|
||||||
-module ShellCheck.Analytics (AnalysisOptions(..), defaultAnalysisOptions, filterByAnnotation, runAnalytics, shellForExecutable, runTests) where
|
-module ShellCheck.Analytics (AnalysisOptions(..), defaultAnalysisOptions, filterByAnnotation, runAnalytics, shellForExecutable, runTests) where
|
||||||
+module ShellCheck.Analytics (AnalysisOptions(..), defaultAnalysisOptions, filterByAnnotation, runAnalytics, shellForExecutable) where
|
+module ShellCheck.Analytics (AnalysisOptions(..), defaultAnalysisOptions, filterByAnnotation, runAnalytics, shellForExecutable) where
|
||||||
|
|
||||||
import Control.Arrow (first)
|
import Control.Arrow (first)
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
@@ -31,10 +30,9 @@ import Debug.Trace
|
@@ -32,11 +32,9 @@ import Debug.Trace
|
||||||
import ShellCheck.AST
|
import ShellCheck.AST
|
||||||
import ShellCheck.Options
|
import ShellCheck.Options
|
||||||
import ShellCheck.Data
|
import ShellCheck.Data
|
||||||
-import ShellCheck.Parser hiding (runTests)
|
-import ShellCheck.Parser hiding (runTests)
|
||||||
+import ShellCheck.Parser
|
+import ShellCheck.Parser
|
||||||
import Text.Regex
|
import ShellCheck.Regex
|
||||||
import qualified Data.Map as Map
|
import qualified Data.Map as Map
|
||||||
-import Test.QuickCheck.All (quickCheckAll)
|
-import Test.QuickCheck.All (forAllProperties)
|
||||||
|
-import Test.QuickCheck.Test (quickCheckWithResult, stdArgs, maxSuccess)
|
||||||
|
|
||||||
data Parameters = Parameters {
|
data Parameters = Parameters {
|
||||||
variableFlow :: [StackData],
|
variableFlow :: [StackData],
|
||||||
@@ -3011,7 +3009,3 @@ checkFindActionPrecedence params = check
|
@@ -3310,7 +3308,3 @@ checkMaskedReturns _ t@(T_SimpleCommand id _ (cmd:rest)) = potentially $ do
|
||||||
param <- getLiteralString t
|
T_DollarExpansion {} -> True
|
||||||
return $ param `elem` strs
|
_ -> False
|
||||||
warnFor t = warn (getId t) 2146 "This action ignores everything before the -o. Use \\( \\) to group."
|
checkMaskedReturns _ _ = return ()
|
||||||
|
-
|
||||||
-
|
-
|
||||||
-return []
|
-return []
|
||||||
-runTests = $quickCheckAll
|
-runTests = $( [| $(forAllProperties) (quickCheckWithResult (stdArgs { maxSuccess = 1 }) ) |])
|
||||||
-
|
diff --git i/ShellCheck/Parser.hs w/ShellCheck/Parser.hs
|
||||||
diff -up ShellCheck-0.3.5/ShellCheck/Parser.hs.orig ShellCheck-0.3.5/ShellCheck/Parser.hs
|
index fd2cbea..0ece932 100644
|
||||||
--- ShellCheck-0.3.5/ShellCheck/Parser.hs.orig 2014-11-10 09:58:27.000000000 +0900
|
--- i/ShellCheck/Parser.hs
|
||||||
+++ ShellCheck-0.3.5/ShellCheck/Parser.hs 2015-01-29 00:18:46.037319167 +0900
|
+++ w/ShellCheck/Parser.hs
|
||||||
@@ -15,8 +15,8 @@
|
@@ -16,7 +16,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/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-}
|
-}
|
||||||
-{-# LANGUAGE NoMonomorphismRestriction, TemplateHaskell #-}
|
{-# LANGUAGE NoMonomorphismRestriction, TemplateHaskell, FlexibleContexts #-}
|
||||||
-module ShellCheck.Parser (Note(..), Severity(..), parseShell, ParseResult(..), ParseNote(..), sortNotes, noteToParseNote, runTests, readScript) where
|
-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
|
+module ShellCheck.Parser (Note(..), Severity(..), parseShell, ParseResult(..), ParseNote(..), sortNotes, noteToParseNote, readScript) where
|
||||||
|
|
||||||
import ShellCheck.AST
|
import ShellCheck.AST
|
||||||
import ShellCheck.Data
|
import ShellCheck.Data
|
||||||
@@ -33,7 +33,6 @@ import Prelude hiding (readList)
|
@@ -34,7 +34,6 @@ import Prelude hiding (readList)
|
||||||
import System.IO
|
import System.IO
|
||||||
import Text.Parsec.Error
|
import Text.Parsec.Error
|
||||||
import GHC.Exts (sortWith)
|
import GHC.Exts (sortWith)
|
||||||
|
@ -76,7 +77,7 @@ diff -up ShellCheck-0.3.5/ShellCheck/Parser.hs.orig ShellCheck-0.3.5/ShellCheck/
|
||||||
|
|
||||||
backslash = char '\\'
|
backslash = char '\\'
|
||||||
linefeed = optional carriageReturn >> char '\n'
|
linefeed = optional carriageReturn >> char '\n'
|
||||||
@@ -2137,7 +2136,3 @@ parseShell filename contents =
|
@@ -2163,7 +2162,3 @@ parseShell options filename contents =
|
||||||
|
|
||||||
lt x = trace (show x) x
|
lt x = trace (show x) x
|
||||||
ltt t = trace (show t)
|
ltt t = trace (show t)
|
||||||
|
@ -84,14 +85,14 @@ diff -up ShellCheck-0.3.5/ShellCheck/Parser.hs.orig ShellCheck-0.3.5/ShellCheck/
|
||||||
-return []
|
-return []
|
||||||
-runTests = $quickCheckAll
|
-runTests = $quickCheckAll
|
||||||
-
|
-
|
||||||
diff -up ShellCheck-0.3.5/ShellCheck/Simple.hs.orig ShellCheck-0.3.5/ShellCheck/Simple.hs
|
diff --git i/ShellCheck/Simple.hs w/ShellCheck/Simple.hs
|
||||||
--- ShellCheck-0.3.5/ShellCheck/Simple.hs.orig 2015-01-29 00:11:08.456696153 +0900
|
index 71cde43..70f769c 100644
|
||||||
+++ ShellCheck-0.3.5/ShellCheck/Simple.hs 2015-01-29 00:19:39.305275281 +0900
|
--- i/ShellCheck/Simple.hs
|
||||||
@@ -15,15 +15,13 @@
|
+++ w/ShellCheck/Simple.hs
|
||||||
You should have received a copy of the GNU Affero General Public License
|
@@ -16,14 +16,13 @@
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-}
|
-}
|
||||||
-{-# LANGUAGE TemplateHaskell #-}
|
{-# LANGUAGE TemplateHaskell #-}
|
||||||
-module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage, runTests) where
|
-module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage, runTests) where
|
||||||
+module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage) where
|
+module ShellCheck.Simple (shellCheck, ShellCheckComment, scLine, scColumn, scSeverity, scCode, scMessage) where
|
||||||
|
|
||||||
|
@ -106,10 +107,10 @@ diff -up ShellCheck-0.3.5/ShellCheck/Simple.hs.orig ShellCheck-0.3.5/ShellCheck/
|
||||||
import Text.Parsec.Pos
|
import Text.Parsec.Pos
|
||||||
|
|
||||||
shellCheck :: AnalysisOptions -> String -> [ShellCheckComment]
|
shellCheck :: AnalysisOptions -> String -> [ShellCheckComment]
|
||||||
@@ -71,7 +69,3 @@ prop_commentDisablesAnalysisIssue2 =
|
@@ -74,7 +73,3 @@ prop_optionDisablesIssue1 =
|
||||||
|
|
||||||
prop_optionDisablesIssue1 =
|
prop_optionDisablesIssue2 =
|
||||||
null $ shellCheck (defaultAnalysisOptions { optionExcludes = [2086, 2148] }) "echo $1"
|
null $ shellCheck (defaultAnalysisOptions { optionExcludes = [2148, 1037] }) "echo \"$10\""
|
||||||
-
|
-
|
||||||
-return []
|
-return []
|
||||||
-runTests = $quickCheckAll
|
-runTests = $quickCheckAll
|
||||||
|
|
|
@ -13,10 +13,13 @@
|
||||||
# disable all tests for now to avoid linking QuickCheck
|
# disable all tests for now to avoid linking QuickCheck
|
||||||
%bcond_with tests
|
%bcond_with tests
|
||||||
|
|
||||||
|
# disable profiling symbols
|
||||||
|
%global without_prof 1
|
||||||
|
|
||||||
Name: %{pkg_name}
|
Name: %{pkg_name}
|
||||||
Version: 0.3.5
|
Version: 0.3.7
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Tool for checking common errors in POSIX shell scripts
|
Summary: Shell script analysis tool
|
||||||
|
|
||||||
License: AGPLv3+
|
License: AGPLv3+
|
||||||
URL: http://www.shellcheck.net/about.html
|
URL: http://www.shellcheck.net/about.html
|
||||||
|
@ -32,7 +35,7 @@ BuildRequires: ghc-directory-devel
|
||||||
BuildRequires: ghc-json-devel
|
BuildRequires: ghc-json-devel
|
||||||
BuildRequires: ghc-mtl-devel
|
BuildRequires: ghc-mtl-devel
|
||||||
BuildRequires: ghc-parsec-devel
|
BuildRequires: ghc-parsec-devel
|
||||||
BuildRequires: ghc-regex-compat-devel
|
BuildRequires: ghc-regex-tdfa-devel
|
||||||
BuildRequires: ghc-transformers-devel
|
BuildRequires: ghc-transformers-devel
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
BuildRequires: ghc-QuickCheck-devel
|
BuildRequires: ghc-QuickCheck-devel
|
||||||
|
@ -124,6 +127,12 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Apr 26 2015 Dridi <dridi.boukelmoune@gmail.com> - 0.3.7-1
|
||||||
|
- bumped to version 0.3.7
|
||||||
|
- updated summary with cabal's synopsis
|
||||||
|
- removed profiling symbols causing an FTBFS
|
||||||
|
- replaced regex-compat with regex-tdfa
|
||||||
|
|
||||||
* Wed Jan 28 2015 Jens Petersen <petersen@redhat.com> - 0.3.5-1
|
* Wed Jan 28 2015 Jens Petersen <petersen@redhat.com> - 0.3.5-1
|
||||||
- update to 0.3.5
|
- update to 0.3.5
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue