extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-08-08 23:20:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add variable expansion to INCLUDE

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1783 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
2004-11-29 15:05:16 +00:00
parent d00fda4e1f
commit 40dd271a84
6 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
STABLE2/functions
View File

@ -52,9 +52,9 @@ qt()
#
# Perform variable substitution on the passed argument and echo the result
#
expand() # $1 = contents of variable which may be the name of another variable
expand() # $@ = contents of variable which may be the name of another variable
{
eval echo \"$1\"
eval echo \"$@\"
}
#
@ -104,7 +104,8 @@ ensure_config_path() {
#
# Find a File -- For relative file name, look first in $SHOREWALL_DIR then in /etc/shorewall
#
find_file()
find_file
()
{
local saveifs= directory
@ -434,7 +435,7 @@ read_file() # $1 = file name, $2 = nest count
while read first rest; do
if [ "x$first" = "xINCLUDE" ]; then
if [ $2 -lt 4 ]; then
read_file $(find_file ${rest%#*}) $(($2 + 1))
read_file $(find_file $(expand ${rest%#*})) $(($2 + 1))
else
echo " WARNING: INCLUDE in $1 ignored (nested too deeply)" >&2
fi
@ -452,7 +453,7 @@ read_file() # $1 = file name, $2 = nest count
# Function for including one file into another
#
INCLUDE() {
. $(find_file $@)
. $(find_file $(expand $@))
}
#