4 files changed, 55 insertions, 48 deletions
diff --git a/system/autojump/README b/system/autojump/README
index 31863dd0810d..3d2ad6a249c3 100644
--- a/system/autojump/README
+++ b/system/autojump/README
@@ -1,27 +1,7 @@
-autojump is a faster way to navigate your filesystem. It works by
+Autojump is a faster way to navigate your filesystem. It works by
 maintaining a database of the directories you use the most from the
-command line. The jumpstat command shows you the current contents
-of the database. You need to work a little bit before the database
+command line.  You need to work a little bit before the database
 becomes usable. Autojump will listen and rank your 'cd' commands by
 frequency. Once your database is reasonably complete, you can "jump"
 to a commonly "cd"ed directory.  It supports the bash, zsh, and
 tcsh shells.
-
-Installation
-------------
-
-Add the following to your .bashrc so that autojump commands will
-be recognized:
-
-source /etc/profile.d/autojump.bash
-
-Next, open a new shell and execute:
-
-$ cd /tmp
-$ cd /home
-$ cd /var
-$ j tmp
-
-You should be dropped back into the /tmp directory.  You can activate
-autojump for other shells by changing the sourced file extension to
-a supported shell name.
diff --git a/system/autojump/README.SBo b/system/autojump/README.SBo
new file mode 100644
index 000000000000..3ab2660fbe43
--- /dev/null
+++ b/system/autojump/README.SBo
@@ -0,0 +1,27 @@
+Installation
+------------
+
+Add the following to your .bashrc:
+
+[[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh
+
+You must open a new shell for autojump to become active.  You may
+also need to log in and out of your desktop environment.
+
+Usage
+-----
+
+$ cd /tmp
+$ cd /home
+$ cd /var
+$ cd /var/log
+$ j tmp
+$ j log
+$ jo /home
+$ j -s
+
+The "j" command drops you back into each directory.  The "jo"
+command will launch a file manager for the home directory if
+you are using a graphical environment.  Adding "-s" to the "j"
+command will list your autojump database.  See the man page
+for further details.
diff --git a/system/autojump/autojump.SlackBuild b/system/autojump/autojump.SlackBuild
index 9842c37d48c5..671be288f894 100644
--- a/system/autojump/autojump.SlackBuild
+++ b/system/autojump/autojump.SlackBuild
@@ -2,10 +2,8 @@
 
 # Slackware build script for autojump
 
-# Copyright 2015, Brenton Earl <brent@exitstatusone.com, Tooele, UT, USA
-# All rights reserved.
-#
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2015-2016 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=autojump
-VERSION=${VERSION:-22.2.4}
+VERSION=${VERSION:-22.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,32 +40,34 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}-release-v${VERSION}
-tar xvf $CWD/release-v${VERSION}.tar.gz || tar xvf $CWD/${PRGNAM}-release-v${VERSION}.tar.gz
-cd ${PRGNAM}-release-v${VERSION}
+rm -rf $PRGNAM-release-v$VERSION
+tar xvf $CWD/release-v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-release-v$VERSION.tar.gz
+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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
+
+# Adjust man page destdir
+sed -i "s/'share', 'man'/'man'/" install.py
+
+# Post install message may confuse users, removed
+# Details listed in included README
+sed -i '213,215d' install.py
+
+# Adjust path for bash file source
+sed -i "s:/usr/local/:/usr/:g" bin/$PRGNAM.sh
 
-install -Dm755 bin/autojump $PKG/usr/bin/autojump
-install -Dm755 bin/autojump_argparse.py $PKG/usr/bin/autojump_argparse.py
-install -Dm755 bin/autojump_data.py $PKG/usr/bin/autojump_data.py
-install -Dm755 bin/autojump_utils.py $PKG/usr/bin/autojump_utils.py
-install -Dm755 bin/$PRGNAM.bash $PKG/etc/profile.d/$PRGNAM.bash
-install -Dm755 bin/$PRGNAM.sh $PKG/etc/profile.d/$PRGNAM.sh
-install -Dm755 bin/$PRGNAM.zsh $PKG/etc/profile.d/$PRGNAM.zsh
-install -Dm755 bin/$PRGNAM.fish $PKG/etc/profile.d/$PRGNAM.fish
-install -Dm644 bin/_j $PKG/usr/share/zsh/site-functions/_j
-install -Dm644 bin/icon.png $PKG/usr/share/$PRGNAM/icon.png
-install -Dm644 docs/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/autojump/autojump.info b/system/autojump/autojump.info
index b7002142b71b..91bd09b46396 100644
--- a/system/autojump/autojump.info
+++ b/system/autojump/autojump.info
@@ -1,8 +1,8 @@
 PRGNAM="autojump"
-VERSION="22.2.4"
+VERSION="22.5.0"
 HOMEPAGE="https://github.com/wting/autojump"
-DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.2.4.tar.gz"
-MD5SUM="136fc755090496b29bf664ffdf706d53"
+DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.5.0.tar.gz"
+MD5SUM="7df938d26e0ac3b43dfe46cc6c154fc1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""