fix exception handling:

 - exported string is now a single regexp, as automatic dependencies exceptions
 - don't change directory in compress_file, so as to match absolute path easily,
   as $File::Find::name will always be relative to $buildroot

1 files changed, 3 insertions, 7 deletions

diff --git a/fix_eol b/fix_eol
index 8634b46..4381cf5 100755
--- a/fix_eol
+++ b/fix_eol
@@ -13,12 +13,8 @@ die "Invalid build root" unless -d $buildroot;
 # normalize build root
 $buildroot =~ s|/$||;
 
-my $exclude_string = join('|',
-    map { '(:?' . quotemeta($_) . ')' }
-    $ENV{EXCLUDE_FROM_EOL_CONVERSION} ?
-        split(' ', $ENV{EXCLUDE_FROM_EOL_CONVERSION}) : ()
-);
-my $exclude_pattern = qr/$exclude_string/;
+my $exclude_pattern = $ENV{EXCLUDE_FROM_EOL_CONVERSION} ?
+    qr/$ENV{EXCLUDE_FROM_EOL_CONVERSION}/ : undef;
 
 find(\&convert, $buildroot);
 
@@ -30,7 +26,7 @@ sub convert {
     # skip binary files
     return unless -T $_;
     # skip excluded files
-    return if $exclude_string && $File::Find::name =~ $exclude_pattern;
+    return if $exclude_pattern && $File::Find::name =~ $exclude_pattern;
 
     # check if first line has less than 80 characters and ends with \r\n
     open(my $in, '<', $_) or die "Unable to open file $_: $!";