summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Talker2017-12-26 13:35:46 +0300
committerAlex Talker2017-12-26 13:35:46 +0300
commite18cd9960cdb41643aa064ec6930715f04a3dda0 (patch)
treee9040f6c944d5733489a2513d8d90599d50ce31b
parent91ddd0487048cbce5e8ef2eb281c661267baabf8 (diff)
downloadaur-e18cd9960cdb41643aa064ec6930715f04a3dda0.tar.gz
Update generator
-rw-r--r--PKGBUILD.template10
-rw-r--r--generator.pl9
2 files changed, 11 insertions, 8 deletions
diff --git a/PKGBUILD.template b/PKGBUILD.template
index e4367e94c3ec..751894722db4 100644
--- a/PKGBUILD.template
+++ b/PKGBUILD.template
@@ -4,7 +4,7 @@
pkgname=thunderbird-earlybird
_name=thunderbird
_channel=earlybird
-_milestone=[% version %].0a2
+_milestone=[% version %].[% alpha %]
_release_year=[% year %]
_release_month=[% month %]
@@ -13,7 +13,7 @@ _release_time=$_release_year-$_release_month-$_release_day-[% hour %]-[% minute
_buildid=[% year %][% month %][% day %][% hour %][% minute %][% second %]
-pkgver=[% version %].0a2.$_buildid
+pkgver=[% version %].[% alpha %].$_buildid
pkgrel=1
pkgdesc="Standalone Mail/News reader - Earlybird channel"
arch=('i686' 'x86_64')
@@ -29,9 +29,9 @@ install="${pkgname}.install"
source=("${pkgname}.desktop")
-_base_url="http://ftp.mozilla.org/pub/thunderbird/nightly/$_release_year/$_release_month/$_release_time-comm-aurora"
-source_i686=("$_base_url/thunderbird-[% version %].0a2.en-US.linux-i686.tar.bz2")
-source_x86_64=("$_base_url/thunderbird-[% version %].0a2.en-US.linux-x86_64.tar.bz2")
+_base_url="http://ftp.mozilla.org/pub/thunderbird/nightly/$_release_year/$_release_month/$_release_time-comm-central"
+source_i686=("$_base_url/thunderbird-[% version %].[% alpha %].en-US.linux-i686.tar.bz2")
+source_x86_64=("$_base_url/thunderbird-[% version %].[% alpha %].en-US.linux-x86_64.tar.bz2")
sha512sums=('a36bb5710b9cd6637cf6f538808e2fba8c99fdd1d486446ff9ee8094ca30b5592c17b3e808cae1da7ff2b28123f54902ed4ee1501585a8dcfc54d581588638d3')
sha512sums_i686=('[% sha512sums_i686 %]')
diff --git a/generator.pl b/generator.pl
index 6e7cfbbaf137..5a4c939abe00 100644
--- a/generator.pl
+++ b/generator.pl
@@ -66,7 +66,8 @@ sub _get_data {
$month =~ s:/::;
$data->{month} = $month;
- my $release = _get_part($ua, $uri, qr(aurora/$));
+ say "RELEASE: $uri";
+ my $release = _get_part($ua, $uri, qr(comm-central/$));
$uri .= $release;
$release =~ /^\d{4}-\d{2}-(?<day>\d+)-(?<hour>\d+)-(?<minute>\d+)-(?<second>\d+)/;
$data = { %$data, %+ };
@@ -79,8 +80,10 @@ sub _get_data {
my $package_x86_64_sums = _get_part($ua, $uri, qr($lang.linux-x86_64.checksums$));
$data->{sha512sums_x86_64} = _get_hashsum($ua, $uri . $package_x86_64_sums, $package_x86_64);
- $data->{version} = $1 if $package_x86_64 =~ /thunderbird-(\d+)/;
-
+ if ($package_x86_64 =~ /thunderbird-(\d+).(\d+\w+\d+)./) {
+ $data->{version} = $1;
+ $data->{alpha} = $2;
+ }
return $data;
}