AzaezelLinux/abuild
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apkbuild-cpan.in: always start pkgver with a digit

Browse Source 
The 'version' string from CPAN can start with 'v...' or similar.
This commit is contained in:
Joseph Burt 2019-08-20 19:38:23 +00:00 committed by Natanael Copa
parent dbf0e80e62
commit baf17c8dd7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apkbuild-cpan.in
View File

@ -107,10 +107,11 @@ sub write_apkbuild {
authors => ($authors or "# Contributor: $packager\n# Maintainer: $packager"), authors => ($authors or "# Contributor: $packager\n# Maintainer: $packager"),
pkgname => map_cpan_to_apk($moddata->{distribution}), pkgname => map_cpan_to_apk($moddata->{distribution}),
pkgreal => $moddata->{distribution}, pkgreal => $moddata->{distribution},
pkgver => $moddata->{version}, pkgver => $moddata->{version} =~ s/^[^0-9]+//r,
source => $moddata->{download_url} =~ s/$moddata->{version}/\$pkgver/r, source => $moddata->{download_url},
pkgdesc => $distdata->{abstract}, pkgdesc => $distdata->{abstract},
); );
$repl{source} =~ s/$repl{pkgver}/\$pkgver/g;
$template =~ s/\[% (.*?) %\]/$repl{$1}/g; $template =~ s/\[% (.*?) %\]/$repl{$1}/g;
open my $fh, '>', "APKBUILD" or die; open my $fh, '>', "APKBUILD" or die;
@ -338,7 +339,7 @@ given ( $ARGV[0] ) {
when ("upgrade") { when ("upgrade") {
my ($apkbuild, $distdata, $moddata) = get_data; my ($apkbuild, $distdata, $moddata) = get_data;
my $pkgver = $moddata->{version}; my $pkgver = $moddata->{version} =~ s/^[^0-9]+//r;
if ($pkgver != $apkbuild->{pkgver}) { if ($pkgver != $apkbuild->{pkgver}) {
say "Upgrading CPAN module from $apkbuild->{pkgver} to $pkgver"; say "Upgrading CPAN module from $apkbuild->{pkgver} to $pkgver";
@ -358,7 +359,7 @@ given ( $ARGV[0] ) {
} }
when ('check') { when ('check') {
my ($apkbuild, $distdata, $moddata) = get_data; 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}"; say "$apkbuild->{pkgname}: Latest version: $pkgver Packaged version: $apkbuild->{pkgver}";
if ($pkgver ne $apkbuild->{pkgver}) { if ($pkgver ne $apkbuild->{pkgver}) {
exit(1); exit(1);