desktop/bashmount: New maintainer, .new config.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

5 files changed, 56 insertions, 50 deletions

diff --git a/desktop/bashmount/README b/desktop/bashmount/README
index 519fec8f8c..613d61f124 100644
--- a/desktop/bashmount/README
+++ b/desktop/bashmount/README
@@ -1,4 +1,15 @@
-bashmount is a command-line tool to easily manage removable media.
+bashmount (manage removeable media)
 
-An example configuration file is located at /etc/bashmount.conf
-You can copy this to $HOME/.config/bashmount/config.
+bashmount is a menu-driven bash script that can use different
+backends to easily mount, unmount or eject removable devices without
+dependencies on any GUI. An extensive configuration file allows many
+aspects of the script to be modified and custom commands to be run
+on devices.
+
+bashmount can also be used alongside any automounting solutions, such
+as graphical file managers, udev rules, or Udiskie.
+
+An example configuration file is located at "/etc/bashmount.conf",
+with all options commented out. You can modify this, or copy it to
+"~/.config/bashmount/config" and modify it as desired, on a per-user
+basis.
diff --git a/desktop/bashmount/bashmount.SlackBuild b/desktop/bashmount/bashmount.SlackBuild
index 2df30acb11..60d73994ca 100644
--- a/desktop/bashmount/bashmount.SlackBuild
+++ b/desktop/bashmount/bashmount.SlackBuild
@@ -2,31 +2,22 @@
 
 # Slackware build script for bashmount
 
-# Copyright 2022 Brandon Pribula BC, Canada
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Original author: Brandon Pribula BC, Canada
+# Now maintained by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230914 bkw: BUILD=2
+# - take over maintenance.
+# - relicense as WTFPL.
+# - install config file as .new.
+# - expand README and slack-desc with text from man page.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bashmount
 VERSION=${VERSION:-4.3.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 ARCH="noarch"
@@ -43,34 +34,27 @@ OUTPUT=${OUTPUT:-/tmp}
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG/{etc,usr/{bin,man/man1}} $OUTPUT
 cd $TMP
 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 {} \;
-
-install -D $PRGNAM $PKG/usr/bin/$PRGNAM
-
-# Install manpage
-install -m 644 -D ${PRGNAM}.1 $PKG/usr/man/man1/${PRGNAM}.1
-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
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
-# Install config to /etc
-install -m 644 -D ${PRGNAM}.conf $PKG/etc/${PRGNAM}.conf
+install -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+gzip -9 < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+install -m 644 -D $PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING NEWS README.md  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYING NEWS README.md  $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$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
diff --git a/desktop/bashmount/bashmount.info b/desktop/bashmount/bashmount.info
index 7d6a05ef22..9c9d1d2995 100644
--- a/desktop/bashmount/bashmount.info
+++ b/desktop/bashmount/bashmount.info
@@ -6,5 +6,5 @@ MD5SUM="7c4eb2bc43d263d995f753dd99f1084e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Brandon Pribula"
-EMAIL="b.pribs11@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/desktop/bashmount/doinst.sh b/desktop/bashmount/doinst.sh
new file mode 100644
index 0000000000..0aaebe3821
--- /dev/null
+++ b/desktop/bashmount/doinst.sh
@@ -0,0 +1,11 @@
+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/bashmount.conf.new
diff --git a/desktop/bashmount/slack-desc b/desktop/bashmount/slack-desc
index f376b69d24..c8f400751a 100644
--- a/desktop/bashmount/slack-desc
+++ b/desktop/bashmount/slack-desc
@@ -8,12 +8,12 @@
          |-----handy-ruler------------------------------------------------------|
 bashmount: bashmount (manage removeable media)
 bashmount:
-bashmount: A configurable command-line tool written in bash to easily manage
-bashmount: removable media. Bashmount works fine without a configuration file
-bashmount: however there are some neat things you can do with one.
+bashmount: bashmount is a menu-driven bash script that can use different
+bashmount: backends to easily mount, unmount or eject removable devices without
+bashmount: dependencies on any GUI. An extensive configuration file allows many
+bashmount: aspects of the script to be modified and custom commands to be run
+bashmount: on devices.
 bashmount:
-bashmount:
-bashmount:
-bashmount:
-bashmount: Home page: https://github.com/jamielinux/bashmount
+bashmount: bashmount can also be used alongside any automounting solutions, such
+bashmount: as graphical file managers, udev rules, or Udiskie.
 bashmount: