From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 23 Aug 2014 20:26:40 +0000 (+0300)
Subject: Do not create VPK if no vpk program is provided
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b57f0fcd18ab25a67ce833c100144c208d945f7b;p=app-web-vpkbuilder.git

Do not create VPK if no vpk program is provided
---

diff --git a/lib/App/Web/VPKBuilder.pm b/lib/App/Web/VPKBuilder.pm
index cb3a96f..ebeaa25 100644
--- a/lib/App/Web/VPKBuilder.pm
+++ b/lib/App/Web/VPKBuilder.pm
@@ -6,10 +6,9 @@ use warnings;
 use parent qw/Plack::Component/;
 our $VERSION = '0.000_001';
 
-use File::Basename qw/fileparse/;
 use File::Find qw/find/;
 use File::Path qw/remove_tree/;
-use File::Spec::Functions qw/catfile rel2abs/;
+use File::Spec::Functions qw/abs2rel catfile rel2abs/;
 use File::Temp qw/tempdir/;
 use IO::Compress::Zip qw/zip ZIP_CM_LZMA/;
 use sigtrap qw/die normal-signals/;
@@ -31,7 +30,6 @@ sub new {
 		my $cfg = LoadFile $_;
 		$self->{cfg} = merge $self->{cfg}, $cfg
 	}
-	$self->{cfg}{vpk}           //= 'vpk';
 	$self->{cfg}{vpk_extension} //= 'vpk';
 	$self->{cfg}{sort} = sbe $self->{cfg}{sort_order}, { fallback => sub { shift cmp shift } };
 	$self
@@ -60,9 +58,15 @@ sub makepkg {
 	push @pkgs, split ',', ($self->{cfg}{pkgs}{$_}{deps} // '') for @pkgs;
 	@pkgs = uniq @pkgs;
 	addpkg $_, $dest for @pkgs;
-	system $self->{cfg}{vpk} => $dest;
 	write_file catfile ($dir, 'readme.txt'), $self->{cfg}{readme};
-	zip [catfile($dir, "pkg.$self->{cfg}{vpk_extension}"), catfile($dir, 'readme.txt')], catfile($dir, 'pkg.zip'), FilterName => sub { $_ = fileparse $_ }, -Level => 1;
+	my @zip_files = catfile $dir, 'readme.txt';
+	if ($self->{cfg}{vpk}) {
+		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';
+	}
+	zip \@zip_files, catfile($dir, 'pkg.zip'), FilterName => sub { $_ = abs2rel $_, $dir }, -Level => 1;
 	open my $fh, '<', catfile $dir, 'pkg.zip';
 	remove_tree $dir;
 	[200, ['Content-Type' => 'application/zip', 'Content-Disposition' => 'attachment; filename=pkg.zip'], $fh]
@@ -162,11 +166,11 @@ A string representing the directory in which the packages are built. Must be on
 
 =item vpk
 
-A string representing the program that makes a package out of a folder. Must behave like the vpk program included with Source engine games: that is, when called like C<vpk path/to/folder> it should create a file F<path/to/folder.ext>, where C<ext> is given by the next option. Defaults to 'vpk' (requires a script named vpk in the PATH).
+A string representing the program that makes a package out of a folder. Must behave like the vpk program included with Source engine games: that is, when called like C<vpk path/to/folder> it should create a file F<path/to/folder.ext>, where C<ext> is given by the next option. If not provided, the folder is included as-is.
 
 =item vpk_extension
 
-The extension of a package. Defaults to C<vpk>
+The extension of a package. Only useful with the C<vpk> option. Defaults to C<vpk>
 
 =back