From 988cfbb3d2c2a0cc385050d13668ba023f4a0d64 Mon Sep 17 00:00:00 2001 From: dsomero Date: Wed, 23 Mar 2011 18:16:23 -0400 Subject: network/3proxy: Handle .new files correctly. Signed-off-by: dsomero --- network/3proxy/3proxy.SlackBuild | 7 +++---- network/3proxy/doinst.sh | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 network/3proxy/doinst.sh diff --git a/network/3proxy/3proxy.SlackBuild b/network/3proxy/3proxy.SlackBuild index d71df94792..7f93f96034 100644 --- a/network/3proxy/3proxy.SlackBuild +++ b/network/3proxy/3proxy.SlackBuild @@ -90,10 +90,8 @@ chmod 0755 $PKG/etc/rc.d/rc.3proxy.new find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ @@ -102,6 +100,7 @@ cp -a \ 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} diff --git a/network/3proxy/doinst.sh b/network/3proxy/doinst.sh new file mode 100644 index 0000000000..6daab36402 --- /dev/null +++ b/network/3proxy/doinst.sh @@ -0,0 +1,25 @@ +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() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.3proxy.new -- cgit v1.2.3-65-gdbad