Fix grouping in dmenu_path.

[dmenu.git] / dmenu_path

diff --git a/dmenu_path b/dmenu_path
index e590a5c..a9a89b7 100755 (executable)
--- a/dmenu_path
+++ b/dmenu_path
@@ -1,30 +1,26 @@
-#!/bin/sh
+#!/bin/sh -f

 CACHE=$HOME/.dmenu_cache
 CACHE=$HOME/.dmenu_cache

-UPTODATE=1

 IFS=:
 
 IFS=:
 

-if test ! -f $CACHE 
-then
-       unset UPTODATE
-fi
+qfind() {
+       find "$@" 2>/dev/null
+}

 
 

-if test $UPTODATE
-then
-       for dir in $PATH
-       do
-               test $dir -nt $CACHE && unset UPTODATE
-       done
-fi
+uptodate() {                                                                       
+       test -f $CACHE &&
+               test "$(echo "$PATH")" = "$(sed 1q "$CACHE")" &&
+               qfind $PATH -maxdepth 0 -newer $CACHE
+}

 
 

-if test ! $UPTODATE
+if ! uptodate

 then
 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
+       } > $CACHE.$pid
+       mv $CACHE.$pid $CACHE

 fi
 
 fi
 

-cat $CACHE
+tail -n +2 $CACHE
+