Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDominik Fischer <d.f.fischer@web.de>2015-04-23 16:41:46 +0200
committerAllan McRae <allan@archlinux.org>2015-05-12 14:00:54 +1000
commitb0ae59724ed36242459a91c0f9c5ce036c46de41 (patch)
treed7dc9ed3bdf32e62d5fee5f5c014c2cd661f2184 /scripts
parentd4e5de4bf6b14a51f6ab23c1d80f38c2380917d8 (diff)
makepkg-template: support multiple --template-dirs
Especially when maintaining local templates in addition to the ones stored in /usr/share/makepkg-template, it can be useful to include templates stored in multiple different locations into one PKGBUILD. This patch makes this possible by allowing --template-dir to be specified multiple times. This also introduces a dedicated error message when a template cannot be found, in contrast to the already existing "Couldn't detect version for template '%s'". If a template of the same name is present in more than one of the given directories, the last one always takes precedence. Neither the default behaviour without the option given, nor the handling of a single template dir is changed. Signed-off-by: Dominik Fischer <d.f.fischer@web.de> Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/makepkg-template.pl.in37
1 files changed, 21 insertions, 16 deletions
diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in
index 71d2aae2..98777968 100755
--- a/scripts/makepkg-template.pl.in
+++ b/scripts/makepkg-template.pl.in
@@ -27,7 +27,7 @@ use Module::Load::Conditional qw(can_load);
my %opts = (
input => '@BUILDSCRIPT@',
- template_dir => '@TEMPLATE_DIR@',
+ template_dir => ['@TEMPLATE_DIR@'],
);
my $template_name_charset = qr/[[:alnum:]+_.@-]/;
@@ -98,26 +98,31 @@ sub load_template {
my $ret = "";
- my $path;
+ my $template_name = "$values->{name}";
if (!$opts{newest} and $values->{version}) {
- $path = "$opts{template_dir}/$values->{name}-$values->{version}.template";
- } else {
- $path = "$opts{template_dir}/$values->{name}.template";
+ $template_name .= "-$values->{version}";
}
+ $template_name .= ".template";
- # resolve symlink(s) and use the real file's name for version detection
- my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/);
+ foreach my $dir (reverse @{$opts{template_dir}}) {
+ my $path = "$dir/$template_name";
+ if ( -e $path ) {
+ # resolve symlink(s) and use the real file's name for version detection
+ my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/);
- if (!$version) {
- die sprintf(gettext("Couldn't detect version for template '%s'\n"), $values->{name});
- }
+ if (!$version) {
+ die sprintf(gettext("Couldn't detect version for template '%s'\n"), $path);
+ }
- my $parsed = process_file($path);
+ my $parsed = process_file($path);
- $ret .= "# template start; name=$values->{name}; version=$version;\n";
- $ret .= $parsed;
- $ret .= "# template end;\n";
- return $ret;
+ $ret .= "# template start; name=$values->{name}; version=$version;\n";
+ $ret .= $parsed;
+ $ret .= "# template end;\n";
+ return $ret;
+ }
+ }
+ die sprintf(gettext("Failed to find template file matching '%s'\n"), $template_name);
}
# process input file and load templates for all markers found
@@ -199,7 +204,7 @@ GetOptions(
"input|p=s" => \$opts{input},
"output|o=s" => \$opts{output},
"newest|n" => \$opts{newest},
- "template-dir=s" => \$opts{template_dir},
+ "template-dir=s@" => \$opts{template_dir},
) or usage(1);
$opts{output} = $opts{input} unless $opts{output};