Xinqi Bao's Git
projects
/
dmenu.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Fix the uptodate logic (uptodate if !find newer dirs than the cache).
[dmenu.git]
/
dmenu_path
diff --git
a/dmenu_path
b/dmenu_path
index
cd43748
..
3569077
100755
(executable)
--- a/
dmenu_path
+++ b/
dmenu_path
@@
-1,25
+1,26
@@
-#!/bin/sh
+#!/bin/sh
-f
CACHE=$HOME/.dmenu_cache
IFS=:
CACHE=$HOME/.dmenu_cache
IFS=:
+qfind() {
+ find "$@" 2>/dev/null
+}
+
uptodate() {
uptodate() {
- test ! -f $CACHE && return 1
- for dir in $PATH
- do
- test $dir -nt $CACHE && return 1
- done
- return 0
-}
+ test -f $CACHE &&
+ test "$(echo "$PATH")" = "$(sed 1q "$CACHE")" &&
+ ! qfind $PATH -maxdepth 0 -newer $CACHE >/dev/null
+}
if ! uptodate
then
if ! uptodate
then
- for dir in $PATH
- do
- for file in "$dir"/*
- do
- test -x "$file" && echo "${file##*/}"
- done
- done | sort | uniq > $CACHE
+ {
+ echo "$PATH"
+ qfind $PATH -type f -maxdepth 1 '(' -perm -u+x -o -perm -g+x -o -perm -o+x ')' |
+ sed 's,.*/,,' | sort | uniq
+ }
+ mv $CACHE.$pid $CACHE
fi
fi
-cat $CACHE
+tail -n +2 $CACHE
+