X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FApp%2FWeb%2FVPKBuilder.pm;h=63b46060c3b09d0547dedd4e233d66ca6be8c16b;hb=92cb8f72ae9a1eb24a259c712c4ef6991fd72d84;hp=ebeaa257af1aeb704f45a0f3f4c8740e28aa36fa;hpb=b57f0fcd18ab25a67ce833c100144c208d945f7b;p=app-web-vpkbuilder.git

diff --git a/lib/App/Web/VPKBuilder.pm b/lib/App/Web/VPKBuilder.pm
index ebeaa25..63b4606 100644
--- a/lib/App/Web/VPKBuilder.pm
+++ b/lib/App/Web/VPKBuilder.pm
@@ -4,7 +4,7 @@ use 5.014000;
 use strict;
 use warnings;
 use parent qw/Plack::Component/;
-our $VERSION = '0.000_001';
+our $VERSION = '0.000_002';
 
 use File::Find qw/find/;
 use File::Path qw/remove_tree/;
@@ -55,6 +55,7 @@ sub makepkg {
 	my $dir = rel2abs tempdir 'workXXXX', DIR => $self->{cfg}{dir};
 	my $dest = catfile $dir, 'pkg';
 	mkdir $dest;
+	@pkgs = grep { exists $self->{cfg}{pkgs}{$_} } @pkgs;
 	push @pkgs, split ',', ($self->{cfg}{pkgs}{$_}{deps} // '') for @pkgs;
 	@pkgs = uniq @pkgs;
 	addpkg $_, $dest for @pkgs;
@@ -64,7 +65,7 @@ sub makepkg {
 		system $self->{cfg}{vpk} => $dest;
 		push @zip_files, catfile $dir, "pkg.$self->{cfg}{vpk_extension}"
 	} else {
-		find sub { push @zip_files, $File::Find::name if -f }, 'pkg';
+		find sub { push @zip_files, $File::Find::name if -f }, $dest;
 	}
 	zip \@zip_files, catfile($dir, 'pkg.zip'), FilterName => sub { $_ = abs2rel $_, $dir }, -Level => 1;
 	open my $fh, '<', catfile $dir, 'pkg.zip';