diff --git a/system/slpkg/doinst.sh b/system/slpkg/doinst.sh index 5fb28930db..236b3a62a7 100644 --- a/system/slpkg/doinst.sh +++ b/system/slpkg/doinst.sh @@ -1,3 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + rm $NEW + fi +} + +config /etc/slpkg/slpkg.conf.new + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild index 1f0ac9ad5d..bc5824bac8 100644 --- a/system/slpkg/slpkg.SlackBuild +++ b/system/slpkg/slpkg.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slpkg -VERSION=${VERSION:-2.0.4} +VERSION=${VERSION:-2.0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,12 +77,16 @@ python setup.py install --root=$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 -p $PKG/etc/slpkg + # check if blacklist file if already exist in /etc/slpkg if [ ! -f "/etc/$PRGNAM/blacklist" ]; then - mkdir -p $PKG/etc/$PRGNAM install -D -m0644 conf/blacklist $PKG/etc/$PRGNAM/blacklist fi +# install configuration file +install -D -m0644 conf/slpkg.conf $PKG/etc/slpkg/slpkg.conf.new + # install man page mkdir -p $PKG/usr/man/man8 gzip -9 man/$PRGNAM.8 diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info index f54f20b8b4..7d670fe4ee 100644 --- a/system/slpkg/slpkg.info +++ b/system/slpkg/slpkg.info @@ -1,8 +1,8 @@ PRGNAM="slpkg" -VERSION="2.0.4" +VERSION="2.0.6" HOMEPAGE="https://github.com/dslackw/slpkg" -DOWNLOAD="https://github.com/dslackw/slpkg/archive/v2.0.4.tar.gz" -MD5SUM="c808e181cd502464aa2d693e72325cb2" +DOWNLOAD="https://github.com/dslackw/slpkg/archive/v2.0.6.tar.gz" +MD5SUM="cee4e3046d1afe901fbe6b32ccc95d24" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""