summaryrefslogtreecommitdiffstats
path: root/apkbuild-cpan.in
diff options
context:
space:
mode:
authorJoseph Burt <caseorum@gmail.com>2019-08-20 19:38:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-10-01 17:08:51 +0100
commitbaf17c8dd7048f7eb7ed72c522effee581c4bb37 (patch)
treec2793395f7b4666d7f5adcb6c28c6623d70a2c8a /apkbuild-cpan.in
parentdbf0e80e6261ab17ee462627e0e5aedcf097bfd9 (diff)
downloadabuild-baf17c8dd7048f7eb7ed72c522effee581c4bb37.tar.bz2
abuild-baf17c8dd7048f7eb7ed72c522effee581c4bb37.tar.xz
apkbuild-cpan.in: always start pkgver with a digit
The 'version' string from CPAN can start with 'v...' or similar.
Diffstat (limited to 'apkbuild-cpan.in')
-rw-r--r--apkbuild-cpan.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/apkbuild-cpan.in b/apkbuild-cpan.in
index df50d50..3a694f2 100644
--- a/apkbuild-cpan.in
+++ b/apkbuild-cpan.in
@@ -107,10 +107,11 @@ sub write_apkbuild {
authors => ($authors or "# Contributor: $packager\n# Maintainer: $packager"),
pkgname => map_cpan_to_apk($moddata->{distribution}),
pkgreal => $moddata->{distribution},
- pkgver => $moddata->{version},
- source => $moddata->{download_url} =~ s/$moddata->{version}/\$pkgver/r,
+ pkgver => $moddata->{version} =~ s/^[^0-9]+//r,
+ source => $moddata->{download_url},
pkgdesc => $distdata->{abstract},
);
+ $repl{source} =~ s/$repl{pkgver}/\$pkgver/g;
$template =~ s/\[% (.*?) %\]/$repl{$1}/g;
open my $fh, '>', "APKBUILD" or die;
@@ -338,7 +339,7 @@ given ( $ARGV[0] ) {
when ("upgrade") {
my ($apkbuild, $distdata, $moddata) = get_data;
- my $pkgver = $moddata->{version};
+ my $pkgver = $moddata->{version} =~ s/^[^0-9]+//r;
if ($pkgver != $apkbuild->{pkgver}) {
say "Upgrading CPAN module from $apkbuild->{pkgver} to $pkgver";
@@ -358,7 +359,7 @@ given ( $ARGV[0] ) {
}
when ('check') {
my ($apkbuild, $distdata, $moddata) = get_data;
- my $pkgver = $moddata->{version};
+ my $pkgver = $moddata->{version} =~ s/^[^0-9]+//r;
say "$apkbuild->{pkgname}: Latest version: $pkgver Packaged version: $apkbuild->{pkgver}";
if ($pkgver ne $apkbuild->{pkgver}) {
exit(1);