From: Connor Lane Smith <cls@lubutu.com>
Date: Mon, 19 Dec 2011 15:52:48 +0000 (+0100)
Subject: merge stest -> default
X-Git-Url: https://git.xinqibao.xyz/dmenu.git/commitdiff_plain/6664e4233faa3d6b677a24196e9af4ac5b1920fd?hp=-c

merge stest -> default
---

6664e4233faa3d6b677a24196e9af4ac5b1920fd
diff --combined dmenu_run
index 976da46,e0a3e13..052e51b
--- a/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"} &