drw_text: improve performance when there's no match

[dmenu.git] / dmenu_path

diff --git a/dmenu_path b/dmenu_path
index e725ede..3a7cda7 100755 (executable)
--- a/dmenu_path
+++ b/dmenu_path
@@ -1,32 +1,13 @@
 #!/bin/sh
 #!/bin/sh

-CACHE=$HOME/.dmenu_cache
-UPTODATE=1
-IFS=:
-
-uptodate() { [ $UPTODATE -eq 1 ]; }

 
 

-if test ! -f $CACHE 
-then
-       UPTODATE=0
-fi
+cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
+cache="$cachedir/dmenu_run"

 
 

-if uptodate
-then
-       for dir in $PATH
-       do
-               test $dir -nt $CACHE && { UPTODATE=0; break; }
-       done
-fi
+[ ! -e "$cachedir" ] && mkdir -p "$cachedir"

 
 

-if ! uptodate
-then
-       for dir in $PATH
-       do
-               for file in "$dir"/*
-               do
-                       test -x "$file" && echo "${file##*/}"
-               done
-       done | sort | uniq > $CACHE
+IFS=:
+if stest -dqr -n "$cache" $PATH; then
+       stest -flx $PATH | sort -u | tee "$cache"
+else
+       cat "$cache"

 fi
 fi

-
-cat $CACHE