A few minor changes to some messages and a couple variable improvements.

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

diff --git a/packaging/release-rsync b/packaging/release-rsync
index f5d47b9..65b5082 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -163,7 +163,7 @@ foreach my $fn (@tweak_files) {
        s/^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)/$1$today$2/m;
        s/^(This man ?page is current for version) \S+ (of rsync)/$1 $version $2/m;
     } else {
-       s/^(NEWS for rsync \Q$version\E) \(UNRELEASED\)\s*$/$1 ($today)\n/m;
+       s/^(NEWS for rsync \Q$version\E) \(UNRELEASED\)\s*\n/$1 ($today)\n/m;
        s/^\t\S\S\s\S\S\S\s\d\d\d\d(\t\Q$version\E)/\t$ztoday$1/m;
     }
     open(OUT, '>', $fn) or die $!;
@@ -205,18 +205,21 @@ if (!/skip/i) {
     system "patches/verify-patches -pun -an";
 }
 
-my $tar_file = "$dest/rsync-$version.tar.gz";
-my $diff_file = "$dest/rsync-$lastversion-$version.diffs.gz";
+my $tar_name = "rsync-$version.tar.gz";
+my $diff_name = "rsync-$lastversion-$version.diffs.gz";
+my $tar_file = "$dest/$tar_name";
+my $diff_file = "$dest/$diff_name";
 
 print $break, <<EOT;
 
 About to do the following in the samba-rsync-ftp dir:
     - move the old tar/diff files into the appropriate old-* dirs
-    - hard-link moved tar/diff files to old files on samba.org$skipping
-    - create release tar, "$tar_file"
-    - create release diffs, "$diff_file"
+    - copy the moved tar/diff files on samba.org$skipping
+    - create release tar, "$tar_name"
+    - create release diffs, "$diff_name"
     - update README, *NEWS, TODO, and cvs.log
     - update rsync*.html man pages
+    - gpg-sign the release files$skipping
 
 EOT
 print "<Press Enter to continue> ";
@@ -259,12 +262,12 @@ if ($diffdir ne $dest) {
     }
 
     # Optimize our future upload (in the absence of --detect-renamed) by
-    # hard-linking the above moved files on the remote server.
+    # copying the above moved files on the remote server.
     if ($live) {
        my $remote_cmd = '';
        foreach (@moved_files) {
            my($path, $fn) = m#(.*)/([^/]+)$#;
-           $remote_cmd .= "ln -f /home/ftp/pub/rsync/{$fn,$path};";
+           $remote_cmd .= "cp -p /home/ftp/pub/rsync/{$fn,$path};";
        }
        system "ssh samba.org '$remote_cmd'";
     }
@@ -277,7 +280,7 @@ if ($diffdir ne $dest) {
 
 print "Creating $tar_file ...\n";
 system "fakeroot tar czf $tar_file rsync-$version";
-open(TAR, '|-', "fakeroot tar --files-from=- --no-recursion --mode=g-w -czf $tar_file rsync-$version") or die $!;
+open(TAR, '|-', "fakeroot tar --files-from=- --no-recursion --mode=g+w -czf $tar_file rsync-$version") or die $!;
 foreach (@files) {
     print TAR "rsync-$version/$_\n";
 }
@@ -306,8 +309,7 @@ system "rm -rf rsync-*";
 
 if ($live) {
     chdir($dest) or die $!;
-    system "gpg -ba rsync-$version.tar.gz";
-    system "gpg -ba rsync-$lastversion-$version.diffs.gz";
+    system "gpg -ba $tar_name; gpg -ba $diff_name";
 }
 
 print $break, <<EOT;