From 10126a925abf31c6ce527768ddfbe2756fdd2f5b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 18 May 2021 12:16:47 +0800 Subject: [PATCH] add upstream patch for comments breaking haddock --- ...b3ea841bcaf48780bfcfc2e44aa6563a62de.patch | 55 +++++++++++++++++++ ShellCheck.spec | 2 + 2 files changed, 57 insertions(+) create mode 100644 9e60b3ea841bcaf48780bfcfc2e44aa6563a62de.patch diff --git a/9e60b3ea841bcaf48780bfcfc2e44aa6563a62de.patch b/9e60b3ea841bcaf48780bfcfc2e44aa6563a62de.patch new file mode 100644 index 0000000..92ac198 --- /dev/null +++ b/9e60b3ea841bcaf48780bfcfc2e44aa6563a62de.patch @@ -0,0 +1,55 @@ +From 9e60b3ea841bcaf48780bfcfc2e44aa6563a62de Mon Sep 17 00:00:00 2001 +From: Vidar Holen +Date: Thu, 22 Apr 2021 22:17:51 -0700 +Subject: [PATCH] Fix haddock failures (fixes #2216) + +--- + src/ShellCheck/Analytics.hs | 12 ++++++------ + test/buildtest | 2 ++ + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/ShellCheck/Analytics.hs b/src/ShellCheck/Analytics.hs +index b53aee1e..b943cbcf 100644 +--- a/src/ShellCheck/Analytics.hs ++++ b/src/ShellCheck/Analytics.hs +@@ -4155,11 +4155,11 @@ checkEqualsInCommand params originalToken = + _ | "===" `isPrefixOf` s -> borderMsg (getId originalToken) + _ -> prefixMsg (getId cmd) + +- -- $var==42 ++ -- '$var==42' + _ | "==" `isInfixOf` s -> + badComparisonMsg (getId cmd) + +- -- ${foo[x]}=42 and $foo=42 ++ -- '${foo[x]}=42' and '$foo=42' + [T_DollarBraced id braced l] | "=" `isPrefixOf` s -> do + let variableStr = concat $ oversimplify l + let variableReference = getBracedReference variableStr +@@ -4172,22 +4172,22 @@ checkEqualsInCommand params originalToken = + && "]" `isSuffixOf` variableModifier + + case () of +- -- $foo=bar should already have caused a parse-time SC1066 ++ -- '$foo=bar' should already have caused a parse-time SC1066 + -- _ | not braced && isPlain -> + -- return () + + _ | variableStr == "" -> -- Don't try to fix ${}=foo + genericMsg (getId cmd) + +- -- $#=42 or ${#var}=42 ++ -- '$#=42' or '${#var}=42' + _ | "#" `isPrefixOf` variableStr -> + genericMsg (getId cmd) + +- -- ${0}=42 ++ -- '${0}=42' + _ | variableStr == "0" -> + assign0Msg id $ fixWith [replaceToken id params "BASH_ARGV0"] + +- -- $2=2 ++ -- '$2=2' + _ | isPositional -> + positionalMsg id + diff --git a/ShellCheck.spec b/ShellCheck.spec index 4cd044b..ee6d98d 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -17,6 +17,8 @@ Url: https://www.shellcheck.net/ # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources +# https://github.com/koalaman/shellcheck/issues/2216 +Patch0: https://github.com/koalaman/shellcheck/commit/9e60b3ea841bcaf48780bfcfc2e44aa6563a62de.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel