desktop/dmenu: Revert to the dmenu_path script from 4.1.1

The dmenu_path in dmenu 4.3.1 seems to be picking up
non-executables on my system.  I was thinking of waiting
until upstream fixes this, but there is still some churn
going on regarding the dmenu_run/path scripts.  I figured
it would be better to get this small fix out there in the
mean time.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Phillip Warner 2011-07-25 23:27:41 -05:00 committed by Niels Horn
parent b05b92f5b9
commit 2cbbd42d56
3 changed files with 32 additions and 4 deletions

View file

@ -25,15 +25,13 @@
PRGNAM=dmenu
VERSION=4.3.1
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@ -84,6 +82,10 @@ make install \
X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \
DESTDIR=$PKG
# Use older (version 4.1.1) dmenu_path that actually works properly
# Shouldn't be needed after upstream fixes this
cat $CWD/dmenu_path > $PKG/usr/bin/dmenu_path
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true

View file

@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Phillip Warner"
EMAIL="pc_warner@yahoo.com"
APPROVED="dsomero"
APPROVED="rworkman"

26
desktop/dmenu/dmenu_path Normal file
View file

@ -0,0 +1,26 @@
#!/bin/sh
CACHE=$HOME/.dmenu_cache
IFS=:
uptodate() {
test -f "$CACHE" &&
for dir in $PATH
do
test ! $dir -nt "$CACHE" || return 1
done
}
if ! uptodate
then
for dir in $PATH
do
cd "$dir" &&
for file in *
do
test -x "$file" && echo "$file"
done
done | sort | uniq > "$CACHE".$$ &&
mv "$CACHE".$$ "$CACHE"
fi
cat "$CACHE"