X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu_run;h=052e51b3864a510c44d2b73b8405c7064938fb21;hb=1f11faf7b505ac94bee1242e90dbd3ae37a086b4;hp=a15df0f06b968fa786bf679d13d1c83f5ca80baf;hpb=bb4424df072332243890714b055e978a5c70adf3;p=dmenu.git

diff --git a/dmenu_run b/dmenu_run
index a15df0f..052e51b 100755
--- a/dmenu_run
+++ b/dmenu_run
@@ -1,14 +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 -d $PATH | stest -q -n "$CACHE"; then
-		for dir in $PATH; do
-			ls $dir | stest -C $dir -fx
-		done | 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"} &