commit - 8ac44eb75a3e2190aa7b89548956b2de33c5a6ce
commit + a02a1a662362a1e74f627c7f47335b5aeda79c67
blob - 99db24e74e933fab04c06cc31564f3c711ee6f80
blob + a5af9d5b87dfecb2aebb4d7ffbf92a9de4c55392
--- dmenu.c
+++ dmenu.c
setup();
run();
- return EXIT_FAILURE; /* unreachable */
+ return 1; /* unreachable */
}
void
blob - 274791945f4e9237a06ab2eac6bd1c01dcf5ef35
blob + cf75b0afc32c86480261032091dc2c2a76cedc24
--- dmenu_run
+++ dmenu_run
#!/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
fi
(
IFS=:
- if [ "`ls -dt $PATH "$CACHE" | head -n 1`" != "$CACHE" ]; then
- lsx $PATH | sort -u > "$CACHE"
+ if [ "`ls -dt $PATH "$cache" | head -n 1`" != "$cache" ]; then
+ lsx $PATH | sort -u | tee "$cache" | dmenu "$@"
+ else
+ dmenu "$@" < "$cache"
fi
-)
-cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"
+) | read cmd && exec sh -c "$cmd"