inputw: improve correctness and startup performance

[dmenu.git] / dmenu_path

diff --git a/dmenu_path b/dmenu_path
index 84e3015..3a7cda7 100755 (executable)
--- a/dmenu_path
+++ b/dmenu_path
@@ -1,26 +1,13 @@
-#!/bin/sh -f
-CACHE=$HOME/.dmenu_cache
-IFS=:
+#!/bin/sh

 
 

-qfind() {
-       find "$@" 2>/dev/null
-}
+cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
+cache="$cachedir/dmenu_run"

 
 

-uptodate() {                                                                       
-       test -f $CACHE &&
-               test "$(echo "$PATH")" = "$(sed 1q "$CACHE")" &&
-               qfind $PATH -maxdepth 0 -newer $CACHE
-}
+[ ! -e "$cachedir" ] && mkdir -p "$cachedir"

 
 

-if ! uptodate
-then
-       {
-               echo "$PATH"
-               qfind $PATH -type f -maxdepth 1 -perm -u+x -o -perm -g+x -o -perm -o+x |
-                       sed 's,.*/,,' | sort | uniq
-       } > $CACHE.$pid
-       mv $CACHE.$pid $CACHE
+IFS=:
+if stest -dqr -n "$cache" $PATH; then
+       stest -flx $PATH | sort -u | tee "$cache"
+else
+       cat "$cache"

 fi
 fi

-
-tail -n +2 $CACHE
-