osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ShellCheck revision:25, using keep-link
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ShellCheck?expand=0&rev=77
This commit is contained in:
parent
4f34d817a1
commit
b7e83c011c
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ff7534d80c3dc8817c0794a76f432979a7d5c2e537ee5a7c19b424aca41d8472
|
|
||||||
size 173937
|
|
3
ShellCheck-0.8.0.tar.gz
Normal file
3
ShellCheck-0.8.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:62080e8a59174b12ecd2d753af3e6b9fed977e6f5f7301cde027a54aee555416
|
||||||
|
size 194817
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 7 14:54:02 UTC 2021 - psimons@suse.com
|
||||||
|
|
||||||
|
- Update ShellCheck to version 0.8.0.
|
||||||
|
- drop haddock.patch
|
||||||
|
Upstream added a new change log file in this release. With no
|
||||||
|
previous version to compare against, the automatic updater cannot
|
||||||
|
reliable determine the relevante entries for this release.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Apr 23 11:05:19 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
|
Fri Apr 23 11:05:19 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||||
|
|
||||||
|
@ -19,13 +19,12 @@
|
|||||||
%global pkg_name ShellCheck
|
%global pkg_name ShellCheck
|
||||||
%bcond_with tests
|
%bcond_with tests
|
||||||
Name: %{pkg_name}
|
Name: %{pkg_name}
|
||||||
Version: 0.7.2
|
Version: 0.8.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Shell script analysis tool
|
Summary: Shell script analysis tool
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
URL: https://hackage.haskell.org/package/%{name}
|
URL: https://hackage.haskell.org/package/%{name}
|
||||||
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||||
Patch0: haddock.patch
|
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
BuildRequires: ghc-Diff-devel
|
BuildRequires: ghc-Diff-devel
|
||||||
@ -74,7 +73,7 @@ Requires(postun): ghc-compiler = %{ghc_version}
|
|||||||
This package provides the Haskell %{name} library development files.
|
This package provides the Haskell %{name} library development files.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ghc_lib_build
|
%ghc_lib_build
|
||||||
@ -96,7 +95,7 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc README.md
|
%doc CHANGELOG.md README.md
|
||||||
%{_bindir}/shellcheck
|
%{_bindir}/shellcheck
|
||||||
%{_mandir}/man1/shellcheck.1%{?ext_man}
|
%{_mandir}/man1/shellcheck.1%{?ext_man}
|
||||||
|
|
||||||
@ -104,6 +103,6 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%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
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
@ -1,55 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user