summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--network/guacamole-server/doinst.sh3
-rw-r--r--network/guacamole-server/guacamole-server.SlackBuild3
2 files changed, 1 insertions, 5 deletions
diff --git a/network/guacamole-server/doinst.sh b/network/guacamole-server/doinst.sh
index 79f3952787..e696e66243 100644
--- a/network/guacamole-server/doinst.sh
+++ b/network/guacamole-server/doinst.sh
@@ -1,14 +1,11 @@
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...
}
preserve_perms() {
diff --git a/network/guacamole-server/guacamole-server.SlackBuild b/network/guacamole-server/guacamole-server.SlackBuild
index 0772421d3f..29c6bd95a5 100644
--- a/network/guacamole-server/guacamole-server.SlackBuild
+++ b/network/guacamole-server/guacamole-server.SlackBuild
@@ -86,11 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-static=no \
--build=$ARCH-slackware-linux
-# Compile the application and install it into the $PKG directory
make
make install-strip DESTDIR=$PKG
-# Compress man pages
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -100,6 +98,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
mv $PKG/etc/rc.d/guacd $PKG/etc/rc.d/rc.guacd.new