system/the_silver_searcher: New maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 27 insertions, 33 deletions

diff --git a/system/the_silver_searcher/README b/system/the_silver_searcher/README
index 6c4de395db4ce..d66635acefdbb 100644
--- a/system/the_silver_searcher/README
+++ b/system/the_silver_searcher/README
@@ -1,6 +1,9 @@
-Ag is a code searching tool similar to grep and ack, but with a focus on speed.
+the_silver_searcher (grep-like text search, but faster)
 
-Ag searches code about 3-5x faster than ack. It ignores file patterns from your
-.gitignore and .hgignore. If there are files in your source repo you don't want
-to search, just add their patterns to a .agignore file. The command name is 33%
-shorter than ack!
+Ag is a code searching tool similar to grep and ack, but with a focus
+on speed.
+
+Ag searches code about 3-5x faster than ack. It ignores file patterns
+from your .gitignore and .hgignore. If there are files in your source
+repo you don't want to search, just add their patterns to a .agignore
+file. The command name is 33% shorter than ack!
diff --git a/system/the_silver_searcher/the_silver_searcher.SlackBuild b/system/the_silver_searcher/the_silver_searcher.SlackBuild
index 59714bf7bdcb6..ad6b72f00235a 100644
--- a/system/the_silver_searcher/the_silver_searcher.SlackBuild
+++ b/system/the_silver_searcher/the_silver_searcher.SlackBuild
@@ -2,7 +2,8 @@
 
 # SlackBuild script for the_silver_searcher
 
-# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2018 Benjamin Trigona-Harany <email removed>
+# Copyright 2021 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20211018 bkw: v2.2.0, BUILD=2
+# - take over maintenance.
+# - put bash completion stuff in the right place.
+# - include CONTRIBUTING.md in doc dir.
+# - reformat README to 72 columns.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=the_silver_searcher
 VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +45,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -73,17 +77,10 @@ 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 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-AC_SEARCH_OPTS="-I /usr/share/aclocal"
-aclocal $AC_SEARCH_OPTS
-autoconf
-autoheader
-automake --add-missing
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+autoreconf -ivf
 
 CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
@@ -91,18 +88,12 @@ CFLAGS="$SLKCFLAGS -fcommon" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make 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
-
-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
+make install-strip DESTDIR=$PKG bashcompdir=/etc/bash_completion.d
+mv $PKG/etc/bash_completion.d/ag.bashcomp.sh $PKG/etc/bash_completion.d/ag
+gzip $PKG/usr/man/man?/*.*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  LICENSE NOTICE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NOTICE *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/the_silver_searcher/the_silver_searcher.info b/system/the_silver_searcher/the_silver_searcher.info
index 220533cd55896..44c60ce89d903 100644
--- a/system/the_silver_searcher/the_silver_searcher.info
+++ b/system/the_silver_searcher/the_silver_searcher.info
@@ -6,5 +6,5 @@ MD5SUM="bad7f246c21b4cd92bd2553e45178bbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"