1 files changed, 19 insertions, 13 deletions
diff --git a/system/sbotools/sbotools.SlackBuild b/system/sbotools/sbotools.SlackBuild
index 35c7599d2fbfd..b3ae18a3440dc 100644
--- a/system/sbotools/sbotools.SlackBuild
+++ b/system/sbotools/sbotools.SlackBuild
@@ -1,19 +1,19 @@
 #!/bin/bash
 #
-# Slackware build script for <sbotools>
+# Slackware build script for sbotools
+#
 # Written by Jacob Pipkin <j@dawnrazor.net>
+# Altered by K. Eugene Carlson <kvngncrlsn@gmail.com>
 # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sbotools
-VERSION=${VERSION:-2.7}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=$PRGNAM
-
 ARCH=noarch
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -33,9 +33,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -43,8 +43,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# we set INSTALLMAN3DIR=none to elide the Sort::Versions.3 man page so that we
-# don't clobber one from perl-Sort-Versions or Sort::Versions.
 ( cd SBO-Lib
 	/usr/bin/perl Makefile.PL \
 	  PREFIX=/usr \
@@ -60,16 +58,23 @@ find -L . \
 SCRIPTS="check clean config find install remove snap upgrade"
 MANS="man1 man5"
 
-mkdir -p $PKG/usr/sbin
+mkdir -p $PKG/usr/sbin \
+         $PKG/usr/share/zsh/site-functions \
+         $PKG/usr/share/bash-completion/completions
 for i in $SCRIPTS; do
-  cp sbo$i $PKG/usr/sbin/sbo$i
+  install -m 0755 sbo$i $PKG/usr/sbin
+  install -m 0644 completions/zsh/_sbo$i $PKG/usr/share/zsh/site-functions
+  install -m 0644 completions/bash/sbo$i $PKG/usr/share/bash-completion/completions/sbo$i
 done
 
 for i in $MANS; do
   mkdir -p $PKG/usr/man/$i
-  cp $i/* $PKG/usr/man/$i/
+  install -m 0644 $i/* $PKG/usr/man/$i
 done
 
+mkdir -p $PKG/etc/sbotools
+cp sbotools.conf $PKG/etc/sbotools/sbotools.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
 
@@ -78,11 +83,12 @@ 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/usr/doc/$PRGNAM-$VERSION/SBO-Lib
-cp -a SBO-Lib/README SBO-Lib/Changes $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
+cp -a SBO-Lib/README SBO-Lib/Changes LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/SBO-Lib
 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