forked from pool/ShellCheck
osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ShellCheck revision:22, using keep-link
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ShellCheck?expand=0&rev=75
This commit is contained in:
parent
cdf04afb54
commit
4f34d817a1
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:415f23ed77c17cb6837b328a35b9fa262c7d9b1a9093bc801f50d99010e4a41a
|
||||
size 163288
|
3
ShellCheck-0.7.2.tar.gz
Normal file
3
ShellCheck-0.7.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ff7534d80c3dc8817c0794a76f432979a7d5c2e537ee5a7c19b424aca41d8472
|
||||
size 173937
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 23 11:05:19 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
- add haddock.patch to fix build with haddock
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 22 10:06:05 UTC 2021 - psimons@suse.com
|
||||
|
||||
- Update ShellCheck to version 0.7.2.
|
||||
Upstream does not provide a change log file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ShellCheck
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,12 +19,13 @@
|
||||
%global pkg_name ShellCheck
|
||||
%bcond_with tests
|
||||
Name: %{pkg_name}
|
||||
Version: 0.7.1
|
||||
Version: 0.7.2
|
||||
Release: 0
|
||||
Summary: Shell script analysis tool
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://hackage.haskell.org/package/%{name}
|
||||
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: haddock.patch
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-Diff-devel
|
||||
@ -73,7 +74,7 @@ Requires(postun): ghc-compiler = %{ghc_version}
|
||||
This package provides the Haskell %{name} library development files.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%ghc_lib_build
|
||||
|
55
haddock.patch
Normal file
55
haddock.patch
Normal file
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user