Gitweb:
https://git.exim.org/exim.git/commitdiff/b315e9a9f95471046f568ce4841b3b66746adcac
Commit: b315e9a9f95471046f568ce4841b3b66746adcac
Parent: 162e16b13c92af9a68c12da02fc3fa5a72fbebeb
Author: Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Tue Dec 25 20:38:42 2018 +0100
Committer: Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Tue Dec 25 22:29:59 2018 +0100
mk_exim_release: more perlish
---
release-process/scripts/mk_exim_release | 46 +++++++++++++++++++--------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/release-process/scripts/mk_exim_release b/release-process/scripts/mk_exim_release
index 2adcd3a..ecc7701 100755
--- a/release-process/scripts/mk_exim_release
+++ b/release-process/scripts/mk_exim_release
@@ -69,7 +69,8 @@ package Context {
$context->{v}{security} = $+{security};
$context->{v}{rc} = $+{rc};
- die "$ME: This script doesn't work for versions prior 4.92-RCx. Please checkout an older version.\n"
+ die "$ME: This script doesn't work for versions prior 4.92-RCx. "
+ ."Please checkout an older version.\n"
if $context->{v}{major} < 4
or $context->{v}{major} == 4 && $context->{v}{minor} < 92;
@@ -425,34 +426,37 @@ __
# those are artifacts of use of tar for backups and have no place in
# software release packaging; if someone extracts as root, then they should
# get sane file ownerships.
- my $ownership = "";
- if (`tar --help 2>&1` =~ /^\s*--owner=/m) {
- $ownership .= " --owner=$context->{tar_perms}{user} --group=$context->{tar_perms}{group}";
+ my @ownership = (
+ '--owner' => $context->{tar_perms}{user},
+ '--group' => $context->{tar_perms}{group},
# on this GNU tar, --numeric-owner works during creation too
- $ownership .= " --numeric-owner";
- }
+ '--numeric-owner'
+ ) if qx/tar --help 2>&1/ =~ /^\s*--owner=/m;
# See also environment variables set in main, tuning compression levels
- my @COMPRESSIONS = (
- # compressors-dict-key, file-extension, flags-as-string
- [ "gzip", "gz", "--gzip" ],
- [ "bzip2", "bz2", "--bzip2" ],
- [ "lzip", "lz", "--lzip" ],
- [ "xz", "xz", "--xz" ],
+ my %COMPRESSION = (
+ gzip => { extension => 'gz', flags => '--gzip' },
+ bzip2 => { extension => 'bz2', flags => '--bzip2' },
+ lzip => { extension => 'lz', flags => '--lzip' },
+ xz => { extension => 'xz', flags => '--xz' },
);
+
my (%size, %sha256);
+
foreach my $dir ( glob( catdir( $pkg_trees, ( 'exim*-' . $context->{v}{release} ) ) ) ) {
my $dirname = ( splitdir($dir) )[-1];
- foreach my $comp (@COMPRESSIONS) {
- my ($compkey, $extension, $flags) = @{$comp};
- next unless $context->{compressors}{$compkey};
+ foreach my $comp (keys %COMPRESSION) {
+ next unless $context->{compressors}{$comp};
- my $basename = "$dirname.tar.$extension";
+ my $basename = "$dirname.tar.$COMPRESSION{$comp}{extension}";
my $outfile = catfile $pkg_tars, $basename;
print "Creating: $outfile\n" if $verbose || $debug;
- 0 == system("$tar cf $outfile ${flags} ${ownership} -C ${pkg_trees} ${dirname}")
+ 0 == system($tar,
+ cf => $outfile,
+ $COMPRESSION{$comp}{flags},
+ @ownership, -C => $pkg_trees, $dirname)
or exit $? >> 8;
# calculate size and md5sum
@@ -468,9 +472,11 @@ __
# write the sizes file
open my $sizes, '>', $_ = catfile $pkg_tars, 'sizes.txt'
or die "$ME: Can't open `$_': $!\n";
- print $sizes "SIZE($_) = $size{$_}\n" foreach sort keys %size;
- print $sizes "\n";
- print $sizes "SHA256($_) = $sha256{$_}\n" foreach sort keys %sha256;
+
+ print $sizes join "\n",
+ (map { "SIZE($_) = $size{$_}" } sort keys %size),
+ (map { "SHA256($_) = $sha256{$_}" } sort keys %sha256);
+
close($sizes) or die "$ME: Can't close $_: $!\n";
}