A couple minor improvments to the tar-creation code.

[rsync/rsync.git] / packaging / release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index efac18f..932def5 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -194,8 +194,8 @@ rename("a/configure", "a/configure.sh"); # XXX remove soon
 
 system "rsync -a @extra_files rsync-$version/";
 
-system "git-commit -a -m 'Preparing for release of $version'";
-system "git-tag -s -m 'Version $version.' v$version";
+system "git-commit -a -m 'Preparing for release of $version'" and exit 1;
+system "git-tag -s -m 'Version $version.' v$version" and exit 1;
 
 # When creating a pre-release after a normal release, there's nothing to move.
 if ($diffdir ne $dest) {
@@ -238,14 +238,14 @@ if ($diffdir ne $dest) {
 }
 
 print "Creating $srctar_file ...\n";
-system "git-archive --format=tar --prefix=rsync-$version/ v$version >$dest/srctmp.tar";
-system "fakeroot tar rf $dest/srctmp.tar rsync-$version/*; gzip -9 <$dest/srctmp.tar >$srctar_file";
-unlink("$dest/srctmp.tar");
+(my $srctar_tmp = $srctar_file) =~ s/\.gz$//;
+system "git-archive --format=tar --prefix=rsync-$version/ v$version >$srctar_tmp";
+system "fakeroot tar rf $srctar_tmp rsync-$version/*; gzip -9 $srctar_tmp";
 
 print "Creating $diff_file ...\n";
 rename("rsync-$version", 'b');
-my $sed_script = 's/^((---|\+\+\+) [^\t]+)\t.*/\1/';
-system "(diff -up a b | sed -r '$sed_script'; git-diff v$lastversion v$version) | gzip -9 >$diff_file";
+my $sed_script = 's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:';
+system "(git-diff v$lastversion v$version; diff -up a b | sed -r '$sed_script') | gzip -9 >$diff_file";
 system "rm -rf a b";
 
 system "support/patch-update --gen";