holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't use the -quit option to Busybox find

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2018-01-18 11:34:46 -08:00
parent 0e4c1cdac1
commit 422d0b216a
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shorewall/lib.cli-std
View File

@ -384,9 +384,24 @@ uptodate() {
[ -x $1 ] || return 1 [ -x $1 ] || return 1
local dir local dir
local busybox
local find
find=$(mywhich find)
[ -n "$find" ] || return 1
[ -h "${find}" ] && busybox=Yes
for dir in $g_shorewalldir $(split $CONFIG_PATH); do for dir in $g_shorewalldir $(split $CONFIG_PATH); do
if [ -n "$(find ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then if [ -n "${busybox}" ]; then
#
# Busybox 'find' doesn't support -quit.
#
if [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print)" ]; then
return 1;
fi
elif [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then
return 1; return 1;
fi fi
done done