Changeset 21474 for lang/perl/Module-Setup/trunk/lib/Module/Setup/Distribute.pm

Timestamp:

10/17/08 12:57:05 (5 years ago)

Author:

yappo

Message:

Module::Setup::Distribute のテスト追加と dist_path にマクロが複数あったらマクロ展開しないバグを直した

Files:

• lang/perl/Module-Setup/trunk/lib/Module/Setup/Distribute.pm (modified) (3 diffs)

lang/perl/Module-Setup/trunk/lib/Module/Setup/Distribute.pm

@@ -33 +33 @@
 sub dist_path     { shift->{dist_path} };
 sub template_vars { shift->{template_vars} };
+sub install_files { shift->{install_files} };
 
 sub set_template_vars {
@@ -43 +44 @@
 
     my $src      = $context->base_dir->flavor->template->path_to($path);
+    my $template = $src->is_dir ? undef : $src->slurp;
     my $options = +{
         dist_path => ($src->is_dir ? $self->dist_path->subdir($path) : $self->dist_path->file($path)),
-        template  => ($src->is_dir ? undef : $src->slurp || undef),
+        template  => $template,
         chmod     => sprintf('%03o', S_IMODE(( stat $src )[2])),
         vars      => $self->template_vars,
@@ -61 +63 @@
         $options->{template} = delete $options->{content} unless $options->{template};
     }
-    $options->{dist_path} =~ s/____var-(.+)-var____/$options->{vars}->{$1} || $options->{vars}->{config}->{$1}/eg;
+    $options->{dist_path} =~ s/____var-(.+?)-var____/$options->{vars}->{$1} || $options->{vars}->{config}->{$1}/eg;
     $context->call_trigger( replace_distribute_path => $options );