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.armaanb.net/?p=dmenu.git;a=commitdiff_plain;h=6664e4233faa3d6b677a24196e9af4ac5b1920fd

merge stest -> default
---

6664e4233faa3d6b677a24196e9af4ac5b1920fd
diff --cc dmenu_run
index 976da46,e0a3e13..052e51b
--- a/dmenu_run
+++ b/dmenu_run
@@@ -7,9 -5,8 +7,9 @@@ els
  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"} &