Merge commit 'origin/master' into HEAD

[urisagit/Stem.git] / BuildStem.pm

diff --git a/BuildStem.pm b/BuildStem.pm
index 49fcb24..b510809 100644 (file)
--- a/BuildStem.pm
+++ b/BuildStem.pm
@@ -23,14 +23,16 @@ sub process_script_files {
        my $demo_dir   = File::Spec->catdir($self->blib, 'demo');
        File::Path::mkpath( $script_dir );
        File::Path::mkpath( $demo_dir );
+    $self->add_to_cleanup($demo_dir);
 
        foreach my $file (keys %$files) {
                my $dest_dir = $file =~ /_demo$/ ? $demo_dir : $script_dir ;
                my $result = $self->copy_if_modified($file, $dest_dir, 'flatten') or next;
                $self->fix_shebang_line($result) if $self->is_unixish();
                $self->make_executable($result);
+        my $demo_run_dir = File::Spec->catdir($self->base_dir(), 'demo');
                if ( $result =~ /(?:run_stem$)|(?:_demo$)/ ) {
-                       my $result2 = $self->copy_if_modified($result, $self->base_dir(), 'flatten') or next;
+                       my $result2 = $self->copy_if_modified($result, $demo_run_dir, 'flatten') or next;
                        $self->add_to_cleanup($result2);
                }
        }