summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2014-09-10 22:33:19 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-09-13 08:01:13 +0700
commitf33a4a4bcb6c23fa4a4a2657577ba5dfcfc94b59 (patch)
treed1c43ff6ef2657922efccff5af4326941c20cd6b /misc
parentdc33bb9293f99dc9f0df8b586837b4290820efb4 (diff)
downloadslackbuilds-f33a4a4bcb6c23fa4a4a2657577ba5dfcfc94b59.tar.gz
misc/html2ps: Fix leftover cruft in doinst.sh ; rm bashisms
Looking at a1437bd04fa9, it appears that I probably left that config() bit in doinst.sh accidentally as a leftover from an earlier idea of how to handle the config-ish file, and since I completely forgot about the mere presence of the doinst.sh script in the build script itself, I certainly didn't go back and proof the postinstall afterward. Hey, nobody's perfect, right? :-) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'misc')
-rw-r--r--misc/html2ps/doinst.sh2
-rw-r--r--misc/html2ps/html2ps.SlackBuild13
2 files changed, 9 insertions, 6 deletions
diff --git a/misc/html2ps/doinst.sh b/misc/html2ps/doinst.sh
index b50d1fd817..c21aa1ca2c 100644
--- a/misc/html2ps/doinst.sh
+++ b/misc/html2ps/doinst.sh
@@ -15,5 +15,3 @@ if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
-config etc/html2ps/html2psrc.new
-
diff --git a/misc/html2ps/html2ps.SlackBuild b/misc/html2ps/html2ps.SlackBuild
index e190b30204..addbac4766 100644
--- a/misc/html2ps/html2ps.SlackBuild
+++ b/misc/html2ps/html2ps.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for html2ps
-# Copyright 2012 Robby Workman, Northport, Alabama, USA
+# Copyright 2012-2014 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=html2ps
VERSION=${VERSION:-1.0b7}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
ARCH=noarch
@@ -57,7 +57,12 @@ find -L . \
-exec chmod 644 {} \;
# Create the skeleton directory
-mkdir -p $PKG/usr/{bin,man/man{1,5},share/html2ps,doc/$PRGNAM-$VERSION}
+mkdir -p \
+ $PKG/usr/bin \
+ $PKG/usr/man/man1 \
+ $PKG/usr/man/man5 \
+ $PKG/usr/share/html2ps \
+ $PKG/usr/doc/$PRGNAM-$VERSION
printf "
@@ -73,7 +78,7 @@ ${PAPER}
" | ./install
# Install xhtml2ps stuff
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
cp -a contrib/xhtml2ps/xhtml2ps $PKG/usr/bin
cat $CWD/xhtml2ps.desktop > $PKG/usr/share/applications/xhtml2ps.desktop
cat $CWD/xhtml2ps.png > $PKG/usr/share/pixmaps/xhtml2ps.png