mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-15 04:04:10 +01:00
Fix '-C' in export command; fix RCP_COMMAND invocation
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6372 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
fc192962c4
commit
1304b29142
@ -1053,7 +1053,7 @@ rcp_command() {
|
||||
files="$1"
|
||||
destination=$2
|
||||
|
||||
eval $SCP_COMMAND
|
||||
eval $RCP_COMMAND
|
||||
}
|
||||
|
||||
#
|
||||
@ -1174,7 +1174,7 @@ reload_command() # $* = original arguments less the command.
|
||||
#
|
||||
export_command() # $* = original arguments less the command.
|
||||
{
|
||||
local verbose=$(make_verbose) file= finished=0 directory target
|
||||
local verbose=$(make_verbose) file= finished=0 directory target compiler=
|
||||
|
||||
while [ $finished -eq 0 -a $# -gt 0 ]; do
|
||||
option=$1
|
||||
@ -1190,7 +1190,7 @@ export_command() # $* = original arguments less the command.
|
||||
;;
|
||||
C)
|
||||
[ $# -gt 1 ] || fatal_error "-C must be followed by a compiler name"
|
||||
SHOREWALL_COMPILER=$2
|
||||
compiler="-C $2"
|
||||
option=
|
||||
shift
|
||||
;;
|
||||
@ -1231,7 +1231,7 @@ export_command() # $* = original arguments less the command.
|
||||
|
||||
file=$(resolve_file $directory/firewall)
|
||||
|
||||
if shorewall $debugging $verbose compile -e $directory $directory/firewall && \
|
||||
if shorewall $debugging $verbose compile -e $compiler $directory $directory/firewall && \
|
||||
echo "Copying $file and ${file}.conf to ${target#*@}..." && \
|
||||
scp $directory/firewall $directory/firewall.conf $target
|
||||
then
|
||||
|
Loading…
Reference in New Issue
Block a user