2 files changed, 19 insertions, 9 deletions
diff --git a/haskell/haskell-aeson-pretty/haskell-aeson-pretty.SlackBuild b/haskell/haskell-aeson-pretty/haskell-aeson-pretty.SlackBuild
index a6f84bb645..2808910103 100644
--- a/haskell/haskell-aeson-pretty/haskell-aeson-pretty.SlackBuild
+++ b/haskell/haskell-aeson-pretty/haskell-aeson-pretty.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for haskell-aeson-pretty
 
@@ -22,10 +22,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-aeson-pretty
-VERSION=${VERSION:-0.8.7}
+VERSION=${VERSION:-0.8.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
 
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+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}
@@ -89,7 +99,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 +115,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-aeson-pretty/haskell-aeson-pretty.info b/haskell/haskell-aeson-pretty/haskell-aeson-pretty.info
index 8db70aa888..ff7923bfac 100644
--- a/haskell/haskell-aeson-pretty/haskell-aeson-pretty.info
+++ b/haskell/haskell-aeson-pretty/haskell-aeson-pretty.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-aeson-pretty"
-VERSION="0.8.7"
+VERSION="0.8.9"
 HOMEPAGE="https://hackage.haskell.org/package/aeson-pretty"
-DOWNLOAD="https://hackage.haskell.org/packages/archive/aeson-pretty/0.8.7/aeson-pretty-0.8.7.tar.gz"
-MD5SUM="d83188bff0ddecc881279235d1600748"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/aeson-pretty/0.8.9/aeson-pretty-0.8.9.tar.gz"
+MD5SUM="8d58b436360a293dd837677c19ef1381"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-aeson haskell-attoparsec haskell-base-compat haskell-cmdargs haskell-scientific haskell-semigroups haskell-unordered-containers haskell-vector"
+REQUIRES="haskell-aeson haskell-cmdargs"
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"