3 files changed, 34 insertions, 16 deletions
diff --git a/haskell/haskell-ShellCheck/README b/haskell/haskell-ShellCheck/README
index 3fdcbf914b..0a76f6d8cf 100644
--- a/haskell/haskell-ShellCheck/README
+++ b/haskell/haskell-ShellCheck/README
@@ -2,9 +2,11 @@ haskell-ShellCheck - shell script analysis tool
 
 The goals of ShellCheck are:
 
-* To point out and clarify typical beginner's syntax issues, that causes a shell
-  to give cryptic error messages.
-* To point out and clarify typical intermediate level semantic problems, that
-  causes a shell to behave strangely and counter-intuitively.
-* To point out subtle caveats, corner cases and pitfalls, that may cause an
-  advanced user's otherwise working script to fail under future circumstances.
+* To point out and clarify typical beginner's syntax issues, that cause
+  a shell to give cryptic error messages.
+* To point out and clarify typical intermediate level semantic
+  problems, that cause a shell to behave strangely and
+  counter-intuitively.
+* To point out subtle caveats, corner cases and pitfalls, that may
+  cause an advanced user's otherwise working script to fail under
+  future circumstances.
diff --git a/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild b/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild
index 653337cbaf..3e5ed888cc 100644
--- a/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild
+++ b/haskell/haskell-ShellCheck/haskell-ShellCheck.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for haskell-ShellCheck
 
-# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2018, 2020-2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2022 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=haskell-ShellCheck
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
 
@@ -39,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,6 +74,14 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
+cat << EOF > Setup.hs
+module Main (main) where
+
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMain
+EOF
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -89,7 +105,7 @@ runghc Setup copy --destdir=$PKG
 runghc Setup register --gen-pkg-config
 
 PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
-PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
+PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | sed "s/[[:space:]][[:space:]]*/ /" | cut -d" " -f2 )
 mkdir -p $PKG/$PKGCONFD
 mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
 
@@ -105,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/haskell/haskell-ShellCheck/haskell-ShellCheck.info b/haskell/haskell-ShellCheck/haskell-ShellCheck.info
index 90c91f2605..82936c15be 100644
--- a/haskell/haskell-ShellCheck/haskell-ShellCheck.info
+++ b/haskell/haskell-ShellCheck/haskell-ShellCheck.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-ShellCheck"
-VERSION="0.6.0"
+VERSION="0.9.0"
 HOMEPAGE="https://www.shellcheck.net/"
-DOWNLOAD="https://hackage.haskell.org/package/ShellCheck-0.6.0/ShellCheck-0.6.0.tar.gz"
-MD5SUM="570c665dc89d31c5a4e25d52c5790eaf"
+DOWNLOAD="https://hackage.haskell.org/package/ShellCheck-0.9.0/ShellCheck-0.9.0.tar.gz"
+MD5SUM="ac7102f45d8c88ae70b19521d5b27a52"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-aeson haskell-json haskell-QuickCheck haskell-regex-tdfa"
+REQUIRES="haskell-aeson haskell-json haskell-QuickCheck haskell-regex-tdfa haskell-Diff haskell-fgl"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"