merge stest -> default

diff --combined dmenu_run
index 976da46cf9a7cdd5e736d384c17dbc573769a88c,e0a3e131999be9884f736065c46bc1930deaac90..052e51b3864a510c44d2b73b8405c7064938fb21
--- 1/dmenu_run
--- 2/dmenu_run
+++ b/dmenu_run
@@@ -1,15 -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 # if no xdg dir, fall back to dotfile in ~
  fi
  (
        IFS=:
-       if [ "`ls -dt $PATH "$cache" | head -n 1`" != "$cache" ]; then
-               lsx $PATH | sort -u | tee "$cache" | dmenu "$@"
 -      if stest -dqr -n "$CACHE" $PATH; then
 -              stest -flx $PATH | sort -u > "$CACHE"
++      if stest -dqr -n "$cache" $PATH; then
++              stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@"
 +      else
 +              dmenu "$@" < "$cache"
        fi
 -)
 -cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"
 +) | ${SHELL:-"/bin/sh"} &