X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5fa38cd679f73cd21b6e3fd633492756b7436c0e..1b1628b90a561a68371f8da3f1cba8be9c6e4944:/packaging/release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 4a952ff7..0f775118 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -140,6 +140,7 @@ About to:
 EOT
 print "<Press Enter to continue> ";
 $_ = <STDIN>;
+my $f_opt = /f/ ? ' -f' : '';
 
 print $break;
 system "./prepare-source && touch proto.h";
@@ -162,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 $!;
@@ -178,7 +179,7 @@ mkdir('patches/tmp') or die $!;
 system "rsync -a --exclude=patches/ --exclude-from=.cvsignore . patches/tmp/cvsdir/";
 
 print "\n", $break, $note, $break;
-system "patches/verify-patches -un -an";
+system "patches/verify-patches -n -an$f_opt";
 
 print $break;
 system "cvs -q diff | egrep -v '^(===============|RCS file: |retrieving revision |Index: )' | less -p '^diff .*'";
@@ -211,7 +212,7 @@ 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 the new tar/diff files to the old files on samba.org$skipping
+    - hard-link moved tar/diff files to old files on samba.org$skipping
     - create release tar, "$tar_file"
     - create release diffs, "$diff_file"
     - update README, *NEWS, TODO, and cvs.log
@@ -236,30 +237,38 @@ if ($diffdir ne $dest) {
     # We need to run this regardless of $lastversion's "pre"ness.
     my @moved_files;
     foreach my $fn (glob('rsync*pre*.tar.gz*'), glob('rsync*pre*-NEWS')) {
-	link($fn, "old-previews/$fn") or die $!;
-	push(@moved_files, $fn);
+	my $new_fn = "old-previews/$fn";
+	rename($fn, $new_fn) or die $!;
+	push(@moved_files, $new_fn);
     }
 
     if ($version !~ /pre/) {
 	foreach my $fn (glob('rsync*.tar.gz*'), glob('rsync*-NEWS')) {
 	    next if $fn =~ /^rsync.*pre/;
-	    link($fn, "old-versions/$fn") or die $!;
-	    push(@moved_files, $fn);
+	    my $new_fn = "old-versions/$fn";
+	    rename($fn, $new_fn) or die $!;
+	    push(@moved_files, $new_fn);
 	}
 
 	foreach my $fn (glob('rsync*.diffs.gz*')) {
 	    next if $fn =~ /^rsync.*pre/;
-	    link($fn, "old-patches/$fn") or die $!;
-	    push(@moved_files, $fn);
+	    my $new_fn = "old-patches/$fn";
+	    rename($fn, $new_fn) or die $!;
+	    push(@moved_files, $new_fn);
 	}
     }
 
     # Optimize our future upload (in the absence of --detect-renamed) by
-    # uploading the above hard-linked files that we are about to delete.
+    # copying the above moved files on the remote server.
     if ($live) {
-	system "rsync -avHC --include='rsync*.gz*' --include='old-*/' --exclude='*' . samba.org:/home/ftp/pub/rsync";
+	my $remote_cmd = '';
+	foreach (@moved_files) {
+	    my($path, $fn) = m#(.*)/([^/]+)$#;
+	    $remote_cmd .= "cp -p /home/ftp/pub/rsync/{$fn,$path};";
+	}
+	system "ssh samba.org '$remote_cmd'";
     }
-    foreach (@moved_files, glob("rsync*pre*.diffs.gz*")) {
+    foreach (glob("rsync*pre*.diffs.gz*")) {
 	unlink($_);
     }
 
@@ -268,7 +277,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";
 }