Compare commits

..

No commits in common. 'i9' and 'epel9' have entirely different histories.
i9 ... epel9

@ -1 +0,0 @@
5212a632e357fd47c808b9e4e9a3589e288c3f8b SOURCES/ShellCheck-0.8.0.tar.gz

4
.gitignore vendored

@ -1 +1,3 @@
SOURCES/ShellCheck-0.8.0.tar.gz */
*.rpm
ShellCheck-*.tar.gz

@ -0,0 +1,55 @@
From 9e60b3ea841bcaf48780bfcfc2e44aa6563a62de Mon Sep 17 00:00:00 2001
From: Vidar Holen <spam@vidarholen.net>
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

@ -1,18 +1,19 @@
# generated by cabal-rpm-2.0.9 # generated by cabal-rpm-2.2.1
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name ShellCheck %global pkg_name ShellCheck
%global pkgver %{pkg_name}-%{version} %global pkgver %{pkg_name}-%{version}
%{?haskell_setup}
# the tests hang # testsuite hangs on epel9
%bcond_with tests %bcond tests %{undefined el9}
Name: %{pkg_name} Name: %{pkg_name}
Version: 0.8.0 Version: 0.10.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: Shell script analysis tool Summary: Shell script analysis tool
License: GPLv3+ License: GPL-3.0-or-later
Url: https://www.shellcheck.net/ Url: https://www.shellcheck.net/
# Begin cabal-rpm sources: # Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
@ -21,6 +22,23 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# Begin cabal-rpm deps: # Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros BuildRequires: ghc-rpm-macros
BuildRequires: ghc-Diff-devel
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-array-devel
BuildRequires: ghc-base-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-deepseq-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-fgl-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-parsec-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-regex-tdfa-devel
BuildRequires: ghc-transformers-devel
%if %{with ghc_prof}
BuildRequires: ghc-Diff-prof BuildRequires: ghc-Diff-prof
BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-QuickCheck-prof
BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-prof
@ -30,11 +48,14 @@ BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-containers-prof BuildRequires: ghc-containers-prof
BuildRequires: ghc-deepseq-prof BuildRequires: ghc-deepseq-prof
BuildRequires: ghc-directory-prof BuildRequires: ghc-directory-prof
BuildRequires: ghc-fgl-prof
BuildRequires: ghc-filepath-prof BuildRequires: ghc-filepath-prof
BuildRequires: ghc-mtl-prof BuildRequires: ghc-mtl-prof
BuildRequires: ghc-parsec-prof BuildRequires: ghc-parsec-prof
BuildRequires: ghc-process-prof BuildRequires: ghc-process-prof
BuildRequires: ghc-regex-tdfa-prof BuildRequires: ghc-regex-tdfa-prof
BuildRequires: ghc-transformers-prof
%endif
# End cabal-rpm deps # End cabal-rpm deps
BuildRequires: pandoc BuildRequires: pandoc
Provides: shellcheck = %{version}-%{release} Provides: shellcheck = %{version}-%{release}
@ -104,7 +125,8 @@ This package provides the Haskell %{name} profiling library.
# Begin cabal-rpm build: # Begin cabal-rpm build:
%ghc_lib_build %ghc_lib_build
# End cabal-rpm build # End cabal-rpm build
./manpage
pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1
%install %install
@ -117,6 +139,7 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
%check %check
%if %{with tests} %if %{with tests}
PATH=%{buildroot}%{_bindir}:$PATH
%cabal_test %cabal_test
%endif %endif
@ -124,7 +147,7 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
%files %files
# Begin cabal-rpm files: # Begin cabal-rpm files:
%license LICENSE %license LICENSE
%doc README.md %doc CHANGELOG.md README.md
%{_bindir}/shellcheck %{_bindir}/shellcheck
# End cabal-rpm files # End cabal-rpm files
%{_mandir}/man1/shellcheck.1* %{_mandir}/man1/shellcheck.1*
@ -137,7 +160,7 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%doc README.md %doc CHANGELOG.md README.md
%if %{with haddock} %if %{with haddock}
@ -152,8 +175,37 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
%changelog %changelog
* Wed Sep 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.8.0-2 * Sun Jul 21 2024 Jens Petersen <petersen@redhat.com> - 0.10.0-3
- Rebuilt for MSVSphere 9.2 - include CHANGELOG.md
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Apr 15 2024 Dridi Boukelmoune <dridi@fedoraproject.org> - 0.10.0-1
- Updated to 0.10.0
- Reenabled tests by default
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 29 2023 Jens Petersen <petersen@redhat.com> - 0.9.0-4
- rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Jens Petersen <petersen@redhat.com> - 0.9.0-2
- SPDX migration
- refresh to cabal-rpm-2.1.0
* Fri Dec 23 2022 Dridi Boukelmoune <dridi@fedoraproject.org> - 0.9.0-1
- Update to 0.9.0
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jun 15 2022 Jens Petersen <petersen@redhat.com> - 0.8.0-2 * Wed Jun 15 2022 Jens Petersen <petersen@redhat.com> - 0.8.0-2
- add lowercase Provides (#1964325) - add lowercase Provides (#1964325)

@ -0,0 +1 @@
SHA512 (ShellCheck-0.10.0.tar.gz) = 30d574ad718e599a8b6b5346a96cb5af9ec7442f69e2d7b525b27a5b875bb70bc387e8bc010b848c360856f8130a40dbd9bba47a1dec3315cd9b22b1650442c9
Loading…
Cancel
Save