From: Anselm R. Garbe Date: Thu, 24 May 2007 08:34:44 +0000 (+0200) Subject: I agree with the race fix of JG, but I dislike the SUSV3-breaking find, and I don... X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=3a9f3a51ce25717813da7321d4771dca11a25af8;p=dmenu.git I agree with the race fix of JG, but I dislike the SUSV3-breaking find, and I don't care about PATH changes, keep it simple, stupid --- diff --git a/dmenu_path b/dmenu_path index 3569077..d0a32c5 100755 --- a/dmenu_path +++ b/dmenu_path @@ -1,26 +1,26 @@ -#!/bin/sh -f +#!/bin/sh CACHE=$HOME/.dmenu_cache IFS=: -qfind() { - find "$@" 2>/dev/null -} - -uptodate() { - test -f $CACHE && - test "$(echo "$PATH")" = "$(sed 1q "$CACHE")" && - ! qfind $PATH -maxdepth 0 -newer $CACHE >/dev/null +uptodate() { + test ! -f $CACHE && return 1 + for dir in $PATH + do + test $dir -nt $CACHE && return 1 + done + return 0 } if ! uptodate then - { - 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 + for dir in $PATH + do + for file in "$dir"/* + do + test -x "$file" && echo "${file##*/}" + done + done | sort | uniq > $CACHE.$$ + mv $CACHE.$$ $CACHE fi -tail -n +2 $CACHE - +cat $CACHE