X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/a7637438541cc6d16de3003dba8a09cd5915b629..61fd9a693285fe264aa67ffa0ef042a68c63c5cd:/release-process/scripts/mk_exim_release.pl?ds=sidebyside diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl index bd1302f9a..995720e2c 100755 --- a/release-process/scripts/mk_exim_release.pl +++ b/release-process/scripts/mk_exim_release.pl @@ -117,7 +117,7 @@ sub make_version_script { } my $srcdir = File::Spec->catdir( $context->{release_tree}, 'src', 'src' ); - chdir $srcdir or die "chdir $srcdir: $\n"; + chdir $srcdir or die "chdir $srcdir: $!\n"; if ( -f "version.sh" ) { print( "WARNING: version.sh already exists - leaving it in place\n" ); @@ -149,9 +149,9 @@ sub build_html_documentation { my @cmd = ( $genpath, '--spec', $spec, '--filter', $filter, '--latest', $context->{trelease}, '--tmpl', - $templates, '--docroot', $dir, '--localstatic', - (($verbose||$debug) ? '--verbose' : '') + $templates, '--docroot', $dir, '--localstatic' ); + push @cmd, '--verbose' if $verbose or $debug; print "Executing ", join( ' ', @cmd ), "\n"; system(@cmd); @@ -297,6 +297,7 @@ sub do_cleanup { my $context = shift; print "Cleaning up\n" if ($verbose); + chdir( $context->{directory} ) || die; rmtree( $context->{release_tree}, { verbose => $debug } ); rmtree( $context->{docbook}, { verbose => $debug } ); rmtree( $context->{pkgdirs}, { verbose => $debug } );