aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R Garbe2008-04-09 23:31:49 +0100
committerAnselm R Garbe2008-04-09 23:31:49 +0100
commit7195e941c1cb91e347a9c906203ad39245deabd6 (patch)
treee77ce0820f001ff027c30b77c4acc639c42094bf
parent12805b69acac4b2daa09ef7570cf1c3161ba6c9d (diff)
re-applied Peter Hartlich's and Jukkas dmenu-related patches, for odd reasons they disappeared
-rw-r--r--config.mk2
-rwxr-xr-xdmenu_path16
-rwxr-xr-xdmenu_run2
3 files changed, 10 insertions, 10 deletions
diff --git a/config.mk b/config.mk
index 3cc8b32..30e8b64 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
# dmenu version
-VERSION = 3.6
+VERSION = 3.7
# Customize below to fit your system
diff --git a/dmenu_path b/dmenu_path
index d0a32c5..a9ddd47 100755
--- a/dmenu_path
+++ b/dmenu_path
@@ -3,24 +3,24 @@ CACHE=$HOME/.dmenu_cache
IFS=:
uptodate() {
- test ! -f $CACHE && return 1
+ test -f "$CACHE" &&
for dir in $PATH
do
- test $dir -nt $CACHE && return 1
+ test ! $dir -nt "$CACHE" || return 1
done
- return 0
}
if ! uptodate
then
for dir in $PATH
do
- for file in "$dir"/*
+ cd "$dir" &&
+ for file in *
do
- test -x "$file" && echo "${file##*/}"
+ test -x "$file" && echo "$file"
done
- done | sort | uniq > $CACHE.$$
- mv $CACHE.$$ $CACHE
+ done | sort -u > "$CACHE".$$ &&
+ mv "$CACHE".$$ "$CACHE"
fi
-cat $CACHE
+cat "$CACHE"
diff --git a/dmenu_run b/dmenu_run
index 1cecc16..3e1e6e4 100755
--- a/dmenu_run
+++ b/dmenu_run
@@ -1,2 +1,2 @@
#!/bin/sh
-exe=`dmenu_path | dmenu $*` && exec $exe
+exe=`dmenu_path | dmenu ${1+"$@"}` && exec $exe