desktop/j4-dmenu-desktop: Updated for version 2.17.

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

3 files changed, 17 insertions, 64 deletions

diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1 b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1
deleted file mode 100644
index 99c97c3ce5..0000000000
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH J4\-DMENU\-DESKTOP 1
-.SH NAME
-j4-dmenu-desktop \- faster replacement for i3\-dmenu\-desktop 
-.SH DESCRIPTION
-j4\-dmenu\-desktop is a faster replacement for i3-dmenu-desktop. 
-
-Its purpose is to find .desktop files and offer you a menu to start an 
-application using dmenu.
-
-.SH "SYNOPSIS"
-.IP
-\fBj4\-dmenu\-desktop\fR [\fB\-\-dmenu\fR="dmenu \-i"] [\fB\-\-term\fR="_TERMINAL_"]
-.SH OPTIONS
-.IP \fB\-\-dmenu=\fR<command>
-Determines the command used to invoke dmenu
-Executed with your shell ($SHELL) or \fI\,/bin/sh\/\fP
-.IP \fB\-\-use\-xdg\-de\fR
-Enables reading $XDG_CURRENT_DESKTOP to determine the desktop environment
-.IP \fB\-\-display\-binary\fR
-Display binary name after each entry (off by default)
-.IP \fB\-\-term=\fR<command>
-Sets the terminal emulator used to start terminal apps
-.IP \fB\-\-help\fR
-Display this help message
-
-.SH "SEE ALSO"
-https://github.com/enkore/j4\-dmenu\-desktop
-.SH COPYRIGHT
-Copyright (C) 2013 enkore <public+j4\-dmenu\-desktop@enkore.de>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
index 5f8d5e70c2..db6a6483b8 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
@@ -6,18 +6,16 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20180112 bkw:
-# - Update for 2.16 release.
+# 20191128 bkw:
+# - Update for 2.17 release.
+# - Upstream now includes the man page in the tarball, use that
+#   instead the old one that used to be here. Means this script can't
+#   build older versions.
 
-# 20170301 bkw:
-# - Update for 2.15 release.
-# - Use github long-form URL.
-
-# 20160726 bkw:
-# - Update for 2.14 release.
-
-# 20150914 bkw:
-# - Update for 2.13 release.
+# 20180112 bkw: Update for 2.16 release.
+# 20170301 bkw: Update for 2.15 release, use github long-form URL.
+# 20160726 bkw: Update for 2.14 release.
+# 20150914 bkw: Update for 2.13 release.
 
 # 20150512 bkw:
 # - Update for 2.12 release.
@@ -37,7 +35,7 @@
 # - Added default terminal selection
 
 PRGNAM=j4-dmenu-desktop
-VERSION=${VERSION:-2.16}
+VERSION=${VERSION:-2.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,11 +75,8 @@ rm -rf $PRGNAM-r$VERSION
 tar xvf $CWD/$PRGNAM-r$VERSION.tar.gz
 cd $PRGNAM-r$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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # For some reason, j4-dmenu-desktop uses "bash -i -c <command>" to execute
 # the user's choice. bash -i means interactive shell... which causes it to
@@ -120,9 +115,9 @@ cd build
   install -m0755 -s $PRGNAM $PKG/usr/bin/$PRGNAM
 cd ..
 
-# man page taken from upstream git.
+# Tell the user what the default terminal is, in the man page.
 mkdir -p $PKG/usr/man/man1
-sed "s,_TERMINAL_,$MANTERM,g" < $CWD/$PRGNAM.1 | \
+sed "s,to start terminal apps *\$,& (default: $MANTERM)," < $PRGNAM.1 | \
   gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
index 93241dc422..47fe4504b9 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.info
@@ -1,8 +1,8 @@
 PRGNAM="j4-dmenu-desktop"
-VERSION="2.16"
+VERSION="2.17"
 HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
-DOWNLOAD="https://github.com/enkore/j4-dmenu-desktop/archive/r2.16/j4-dmenu-desktop-r2.16.tar.gz"
-MD5SUM="0598ce84481bc671ed3877edad02d264"
+DOWNLOAD="https://github.com/enkore/j4-dmenu-desktop/archive/r2.17/j4-dmenu-desktop-r2.17.tar.gz"
+MD5SUM="18c5cd5f56c49535c19a7de9a34a2119"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu"