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

Export *DIR variables

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-03 10:39:18 -08:00
parent 49c1350aa0
commit 3f73b3c408
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/prog.header
View File

@ -1208,6 +1208,10 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1
shift
@ -1233,7 +1237,7 @@ run_it() {
fi
else
#
# 4.4.8 or later -- no exports required
# 4.4.8 or later -- no additional exports required
#
options='-'
@ -1246,7 +1250,7 @@ run_it() {
[ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE"
fi
$SHOREWALL_SHELL $script $options $@
}

10
Shorewall/Perl/prog.header6
View File

@ -1051,7 +1051,7 @@ get_script_version() { # $1 = script
#
# Do required exports or create the required option string and run the passed script using
# Do required exports and create the required option string and run the passed script using
# $SHOREWALL_SHELL
#
run_it() {
@ -1059,6 +1059,10 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1
shift
@ -1084,7 +1088,7 @@ run_it() {
fi
else
#
# 4.4.8 or later -- no exports required
# 4.4.8 or later -- no additional exports required
#
options='-'
@ -1097,7 +1101,7 @@ run_it() {
[ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE"
fi
$SHOREWALL_SHELL $script $options $@
}

6
Shorewall/lib.cli
View File

@ -69,6 +69,10 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1
shift
@ -94,7 +98,7 @@ run_it() {
fi
else
#
# 4.4.8 or later -- no exports required
# 4.4.8 or later -- no additional exports required
#
options='-'

10
Shorewall6/lib.cli
View File

@ -61,7 +61,7 @@ get_script_version() { # $1 = script
}
#
# Do required exports or create the required option string and run the passed script using
# Do required exports and create the required option string and run the passed script using
# $SHOREWALL_SHELL
#
run_it() {
@ -69,6 +69,10 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1
shift
@ -94,7 +98,7 @@ run_it() {
fi
else
#
# 4.4.8 or later -- no exports required
# 4.4.8 or later -- no additional exports required
#
options='-'
@ -107,7 +111,7 @@ run_it() {
[ -n "$RESTOREFILE" ] && options="${options} -R $RESTOREFILE"
fi
$SHOREWALL_SHELL $script $options $@
}