aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/sbotools2/doinst.sh25
-rw-r--r--system/sbotools2/sbotools2.SlackBuild8
-rw-r--r--system/sbotools2/sbotools2.info6
3 files changed, 34 insertions, 5 deletions
diff --git a/system/sbotools2/doinst.sh b/system/sbotools2/doinst.sh
new file mode 100644
index 0000000000..5008fc57c0
--- /dev/null
+++ b/system/sbotools2/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/sbotools/sbotools.conf.new
diff --git a/system/sbotools2/sbotools2.SlackBuild b/system/sbotools2/sbotools2.SlackBuild
index 728667315a..3175e5d207 100644
--- a/system/sbotools2/sbotools2.SlackBuild
+++ b/system/sbotools2/sbotools2.SlackBuild
@@ -9,7 +9,7 @@
cd "$(dirname "$0")" ; CWD="$(pwd)"
PRGNAM=sbotools2
-VERSION=${VERSION:-2.7.2}
+VERSION=${VERSION:-2.8.0}
ARCH=noarch
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -74,13 +74,17 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
find $PKG -depth -type d -empty -delete || true
+mkdir -p $PKG/etc/sbotools
+cp etc/sbotools.conf $PKG/etc/sbotools/sbotools.conf.new
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
cp -a SBO-Lib/README $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a LICENSE.txt README.md ChangeLog.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a LICENSE.txt ChangeLog.md 'key/slackbuilds-devel@slackbuilds.org.asc' $PKG/usr/doc/$PRGNAM-$VERSION/
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-noarch-$BUILD$TAG.$PKGTYPE
diff --git a/system/sbotools2/sbotools2.info b/system/sbotools2/sbotools2.info
index 9d09191535..9735989a7e 100644
--- a/system/sbotools2/sbotools2.info
+++ b/system/sbotools2/sbotools2.info
@@ -1,8 +1,8 @@
PRGNAM="sbotools2"
-VERSION="2.7.2"
+VERSION="2.8.0"
HOMEPAGE="https://git.server.ky/slackcoder/sbotools2/about/"
-DOWNLOAD="https://git.server.ky/slackcoder/sbotools2/snapshot/sbotools2-2.7.2.tar.xz"
-MD5SUM="8a65055aa72b2952e9a5a8436acd9be5"
+DOWNLOAD="https://git.server.ky/slackcoder/sbotools2/snapshot/sbotools2-2.8.0.tar.xz"
+MD5SUM="d9bea8a026cb04f8e43a5ceb46804d78"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""