mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-26 09:33:14 +01:00
Merge branch '5.1.10'
# Conflicts: # Shorewall/lib.cli-std
This commit is contained in:
commit
4f50303318
@ -382,14 +382,22 @@ uptodate() {
|
|||||||
local dir
|
local dir
|
||||||
local ifs
|
local ifs
|
||||||
|
|
||||||
|
if [ -n "$g_shorewalldir" ]; then
|
||||||
|
if [ -n "$(find ${dir} -maxdepth 1 -newer $1)" ]; then
|
||||||
|
return 1;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
ifs="$IFS"
|
ifs="$IFS"
|
||||||
IFS=':'
|
IFS=':'
|
||||||
|
|
||||||
for dir in $g_shorewalldir $CONFIG_PATH; do
|
for dir in $CONFIG_PATH; do
|
||||||
if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then
|
if [ -n "$dir" ]; then
|
||||||
|
if [ -n "$(find ${dir} -maxdepth 1 -newer $1)" ]; then
|
||||||
IFS="$ifs"
|
IFS="$ifs"
|
||||||
return 1;
|
return 1;
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
IFS="$ifs"
|
IFS="$ifs"
|
||||||
|
Loading…
Reference in New Issue
Block a user