diff options
| -rw-r--r-- | ruby/facter/doinst.sh | 14 | ||||
| -rw-r--r-- | ruby/facter/facter.SlackBuild | 9 | ||||
| -rw-r--r-- | ruby/facter/facter.info | 6 |
3 files changed, 22 insertions, 7 deletions
diff --git a/ruby/facter/doinst.sh b/ruby/facter/doinst.sh new file mode 100644 index 0000000000..65ce6d65a5 --- /dev/null +++ b/ruby/facter/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/facter.conf.new diff --git a/ruby/facter/facter.SlackBuild b/ruby/facter/facter.SlackBuild index 5109b75f53..c8b08e5599 100644 --- a/ruby/facter/facter.SlackBuild +++ b/ruby/facter/facter.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for facter -# Copyright 2012 Thibaut Notteboom, Paris, FRANCE +# Copyright 2012-2013 Thibaut Notteboom, Paris, FRANCE # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=facter -VERSION=${VERSION:-1.6.14} +VERSION=${VERSION:-1.6.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,8 +74,8 @@ ruby install.rb install --destdir=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir $PKG/etc -cp -a etc/facter.conf $PKG/etc/facter.conf +mkdir -p $PKG/etc +cp -a etc/facter.conf $PKG/etc/facter.conf.new 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 @@ -86,6 +86,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 cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/ruby/facter/facter.info b/ruby/facter/facter.info index 05cc0ed60a..f09e1843db 100644 --- a/ruby/facter/facter.info +++ b/ruby/facter/facter.info @@ -1,8 +1,8 @@ PRGNAM="facter" -VERSION="1.6.14" +VERSION="1.6.17" HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" -DOWNLOAD="http://puppetlabs.com/downloads/facter/facter-1.6.14.tar.gz" -MD5SUM="b6c3df8ad1781c10d30785c58a4504ef" +DOWNLOAD="http://puppetlabs.com/downloads/facter/facter-1.6.17.tar.gz" +MD5SUM="7dbefba6148d2c6b6034009c46b3ae14" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |