I've got to stop messing with this...

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6932 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-21 23:35:07 +00:00
parent b2e6f5aea2
commit 148c62f69e

View File

@ -877,12 +877,8 @@ sub read_a_line() {
# #
# Expand Shell Variables using %ENV # Expand Shell Variables using %ENV
# #
while ( $currentline =~ m( ^(.*?) # Part preceding '$' # $ 1 $2 $3 - $4
\$({)? # '$' and optional '{' while ( $currentline =~ m( ^(.*?) \$({)? ([a-zA-Z]\w*) (?(2)}) (.*)$)x ) {
([a-zA-Z]\w*) # Shell Variable Name
(?(2)}) # Match opening '{'
(.*)$)x # Rest of Line
) {
my $val = $ENV{$3}; my $val = $ENV{$3};
$val = '' unless defined $val; $val = '' unless defined $val;
$currentline = join( '', $1 , $val , $4 ); $currentline = join( '', $1 , $val , $4 );