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 3569077..338bac4
--- a/dmenu_path
+++ b/dmenu_path
@@ -1,26 +1,13 @@
-#!/bin/sh -f
-CACHE=$HOME/.dmenu_cache
+#!/bin/sh
+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
 IFS=:
-
-qfind() {
-       find "$@" 2>/dev/null
-}
-
-uptodate() {                                                                       
-       test -f $CACHE &&
-               test "$(echo "$PATH")" = "$(sed 1q "$CACHE")" &&
-               ! qfind $PATH -maxdepth 0 -newer $CACHE >/dev/null
-}
-
-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
-       }
-       mv $CACHE.$pid $CACHE
+if stest -dqr -n "$cache" $PATH; then
+       stest -flx $PATH | sort -u | tee "$cache"
+else
+       cat "$cache"
 fi
-
-tail -n +2 $CACHE
-