add sbase-style ecalloc(), calloc: or die

[dmenu.git] / dmenu_path

diff --git a/dmenu_path b/dmenu_path
old mode 100755 (executable)
new mode 100644 (file)
index e725ede..338bac4
--- a/dmenu_path
+++ b/dmenu_path
@@ -1,32 +1,13 @@
 #!/bin/sh
-CACHE=$HOME/.dmenu_cache
-UPTODATE=1
-IFS=:
-
-uptodate() { [ $UPTODATE -eq 1 ]; }
-
-if test ! -f $CACHE 
-then
-       UPTODATE=0
-fi
-
-if uptodate
-then
-       for dir in $PATH
-       do
-               test $dir -nt $CACHE && { UPTODATE=0; break; }
-       done
+cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
+if [ -d "$cachedir" ]; then
+       cache=$cachedir/dmenu_run
+else
+       cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~
 fi
-
-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
-
-cat $CACHE