aboutsummaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-29 16:06:51 -0400
committerRobby Workman <rworkman@slackbuilds.org>2012-09-29 17:17:42 -0500
commita62126deb67c3de7362ee742cc7eba49c88c0dd6 (patch)
tree49cb9d72d5368c1a90b246d3c81b870f8747e46b /development
parentec8897b13f7e9ef53c62d6e18fb1715baeef0aa1 (diff)
development/monotone: Fixed (Don't use /usr/etc)
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/monotone/doinst.sh14
-rw-r--r--development/monotone/monotone.SlackBuild8
2 files changed, 19 insertions, 3 deletions
diff --git a/development/monotone/doinst.sh b/development/monotone/doinst.sh
new file mode 100644
index 000000000000..19dc6d94d3e2
--- /dev/null
+++ b/development/monotone/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/bash_completion.d/monotone.bash_completion.new
diff --git a/development/monotone/monotone.SlackBuild b/development/monotone/monotone.SlackBuild
index 0a6c7e814a91..1f939b0f44e7 100644
--- a/development/monotone/monotone.SlackBuild
+++ b/development/monotone/monotone.SlackBuild
@@ -27,7 +27,7 @@
PRGNAM=monotone
VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -79,6 +79,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --sysconfdir=/etc \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--htmldir=/usr/doc/$PRGNAM-$VERSION \
@@ -100,11 +101,12 @@ cp -a AUTHORS COPYING ChangeLog HACKING NEWS UPGRADE README contrib \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mkdir -p $PKG/etc/bash_completion.d/
-cp -a extra/shell/monotone.bash_completion $PKG/etc/bash_completion.d/monotone.sh
+mv $PKG/etc/bash_completion.d/monotone.bash_completion \
+ $PKG/etc/bash_completion.d/monotone.bash_completion.new
mkdir -p $PKG/install
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}