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

Merge branch '5.1.11'

Browse Source 
# Conflicts:
#	Shorewall/lib.cli-std
This commit is contained in:
Tom Eastep 2018-01-18 13:37:52 -08:00
commit 37ecbff23a
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall/lib.cli-std
View File

@ -385,18 +385,23 @@ uptodate() {
local dir local dir
local busybox local busybox
local find
[ -h $(mywhich find) ] && busybox=Yes 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 "$busybox" ]; then if [ -n "${busybox}" ]; then
# #
# Busybox 'find' doesn't support -quiet. # Busybox 'find' doesn't support -quiet.
# #
if [ -n "$(find ${dir} -maxdepth 1 -type f -newer $1 -print)" ]; then if [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print)" ]; then
return 1; return 1;
fi fi
elif [ -n "$(find ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then elif [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then
return 1; return 1;
fi fi
done done