system/fuse-exfat: Fix doinst.sh.

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

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

2 files changed, 14 insertions, 16 deletions

diff --git a/system/fuse-exfat/doinst.sh b/system/fuse-exfat/doinst.sh
deleted file mode 100644
index 490d3515a93cb..0000000000000
--- a/system/fuse-exfat/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# `mount -t extfs` looks in /sbin
-( cd sbin ; rm -rf mount.exfat )
-( cd sbin ; ln -sf /usr/sbin/mount.exfat mount.exfat )
diff --git a/system/fuse-exfat/fuse-exfat.SlackBuild b/system/fuse-exfat/fuse-exfat.SlackBuild
index 15a49184b28db..9a1fb3ae42966 100644
--- a/system/fuse-exfat/fuse-exfat.SlackBuild
+++ b/system/fuse-exfat/fuse-exfat.SlackBuild
@@ -23,11 +23,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove doinst.sh, let makepkg generate a correct one.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fuse-exfat
 VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -39,9 +42,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
@@ -76,9 +76,9 @@ 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -92,13 +92,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-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
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-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
+# 20220412 bkw: replaced the doinst.sh with this. why? because the
+# doinst.sh can't create the sbin directory, and "installpkg -root
+# /blah" gave us a /mount.exfat symlink (if /blah/sbin didn't already
+# exist).
+mkdir -p $PKG/sbin
+ln -s ../usr/sbin/mount.exfat $PKG/sbin/mount.exfat
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -106,7 +108,6 @@ 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