re-applied Peter Hartlich's and Jukkas dmenu-related patches, for odd reasons they...

diff --git a/config.mk b/config.mk
index 3cc8b32e9615b533dccc803c255f37dba97bc108..30e8b64b0179576f539d61b9ef2e11019380447d 100644 (file)
--- 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 d0a32c5ef2494295ea0405f3aa1ce27cbbffd057..a9ddd473aa7239fc0cdc3e9b8c33f66d958881d0 100755 (executable)
--- 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 1cecc1622a9b3b8ad5e64c703f495ebe1bb04f91..3e1e6e443e17e5ec78542ef4968625b567850282 100755 (executable)
--- 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