faster dmenu_run -f

diff --git a/dmenu.c b/dmenu.c
index 99db24e74e933fab04c06cc31564f3c711ee6f80..a5af9d5b87dfecb2aebb4d7ffbf92a9de4c55392 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -117,7 +117,7 @@ main(int argc, char *argv[]) {
        setup();
        run();
 
-       return EXIT_FAILURE; /* unreachable */
+       return 1; /* unreachable */
 }
 
 void

diff --git a/dmenu_run b/dmenu_run
index 274791945f4e9237a06ab2eac6bd1c01dcf5ef35..cf75b0afc32c86480261032091dc2c2a76cedc24 100755 (executable)
--- a/dmenu_run
+++ b/dmenu_run
@@ -1,12 +1,15 @@
 #!/bin/sh
-CACHE=${XDG_CACHE_HOME:-"$HOME/.cache"}/dmenu_run
-if [ ! -d "`dirname "$CACHE"`" ]; then
-       CACHE=$HOME/.dmenu_cache
+cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
+if [ -d "$cachedir" ]; then
+       cache=$cachedir/dmenu_run
+else
+       cache=$HOME/.dmenu_cache
 fi
 (
        IFS=:
-       if [ "`ls -dt $PATH "$CACHE" | head -n 1`" != "$CACHE" ]; then
-               lsx $PATH | sort -u > "$CACHE"
+       if [ "`ls -dt $PATH "$cache" | head -n 1`" != "$cache" ]; then
+               lsx $PATH | sort -u | tee "$cache" | dmenu "$@"
+       else
+               dmenu "$@" < "$cache"
        fi
-)
-cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"
+) | read cmd && exec sh -c "$cmd"