mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-15 10:51:02 +01:00
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:
parent
b2e6f5aea2
commit
148c62f69e
@ -877,12 +877,8 @@ sub read_a_line() {
|
||||
#
|
||||
# Expand Shell Variables using %ENV
|
||||
#
|
||||
while ( $currentline =~ m( ^(.*?) # Part preceding '$'
|
||||
\$({)? # '$' and optional '{'
|
||||
([a-zA-Z]\w*) # Shell Variable Name
|
||||
(?(2)}) # Match opening '{'
|
||||
(.*)$)x # Rest of Line
|
||||
) {
|
||||
# $ 1 $2 $3 - $4
|
||||
while ( $currentline =~ m( ^(.*?) \$({)? ([a-zA-Z]\w*) (?(2)}) (.*)$)x ) {
|
||||
my $val = $ENV{$3};
|
||||
$val = '' unless defined $val;
|
||||
$currentline = join( '', $1 , $val , $4 );
|
||||
|
Loading…
Reference in New Issue
Block a user