1 files changed, 23 insertions, 8 deletions
diff --git a/system/autojump/autojump.SlackBuild b/system/autojump/autojump.SlackBuild
index ba2c4d9d93..f87b818b57 100644
--- a/system/autojump/autojump.SlackBuild
+++ b/system/autojump/autojump.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for autojump
 
@@ -23,14 +23,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install the python modules in /usr/share/autojump, not /usr/bin.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=autojump
 VERSION=${VERSION:-22.5.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,9 +56,9 @@ cd $PRGNAM-release-v$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 {} \+
 
 # Adjust man page destdir
 sed -i "s/'share', 'man'/'man'/" install.py
@@ -63,8 +73,13 @@ sed -i "s:/usr/local/:/usr/:g" bin/$PRGNAM.sh
 python install.py --destdir $PKG --prefix 'usr/' \
   --zshshare 'usr/share/zsh/site-functions'
 
-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
+# 20220408 bkw: get the python modules out of /usr/bin, and
+# fix the main program to look for them in the new location.
+mv $PKG/usr/bin/autojump_*.py $PKG/usr/share/autojump
+sed -i '/^from operator import itemgetter/asys.path.append("/usr/share/autojump")' \
+       $PKG/usr/bin/autojump
+
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
@@ -74,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE