X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e60bba3fbc61c979dbc7f215dd16d27537d52bde..fdd10da6f7995296f6bb5ee3dd7231d6dbc20b5e:/packaging/release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 65b50825..cd65fe78 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -155,7 +155,7 @@ foreach my $fn (@tweak_files) {
     undef $/; $_ = <IN>; $/ = "\n";
     close IN;
     if ($fn =~ /configure/) {
-	s/^RSYNC_VERSION.*/RSYNC_VERSION=$version/m;
+	s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m;
     } elsif ($fn =~ /\.spec/) {
 	s/^(Version:) .*/$1 $version/m;
 	s/^(Release:) .*/$1 $release/m;
@@ -214,7 +214,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
-    - copy the moved tar/diff files on samba.org$skipping
+    - hard-link 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
@@ -240,38 +240,30 @@ 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')) {
-	my $new_fn = "old-previews/$fn";
-	rename($fn, $new_fn) or die $!;
-	push(@moved_files, $new_fn);
+	link($fn, "old-previews/$fn") or die $!;
+	push(@moved_files, $fn);
     }
 
     if ($version !~ /pre/) {
 	foreach my $fn (glob('rsync*.tar.gz*'), glob('rsync*-NEWS')) {
 	    next if $fn =~ /^rsync.*pre/;
-	    my $new_fn = "old-versions/$fn";
-	    rename($fn, $new_fn) or die $!;
-	    push(@moved_files, $new_fn);
+	    link($fn, "old-versions/$fn") or die $!;
+	    push(@moved_files, $fn);
 	}
 
 	foreach my $fn (glob('rsync*.diffs.gz*')) {
 	    next if $fn =~ /^rsync.*pre/;
-	    my $new_fn = "old-patches/$fn";
-	    rename($fn, $new_fn) or die $!;
-	    push(@moved_files, $new_fn);
+	    link($fn, "old-patches/$fn") or die $!;
+	    push(@moved_files, $fn);
 	}
     }
 
     # Optimize our future upload (in the absence of --detect-renamed) by
-    # copying the above moved files on the remote server.
+    # using rsync to hard-link the above files on samba.org.
     if ($live) {
-	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'";
+	system "rsync -avHOC --include='rsync*.gz*' --include='old-*/' --exclude='*' . samba.org:/home/ftp/pub/rsync";
     }
-    foreach (glob("rsync*pre*.diffs.gz*")) {
+    foreach (@moved_files, glob("rsync*pre*.diffs.gz*")) {
 	unlink($_);
     }
 
@@ -292,7 +284,7 @@ system "tar xzf $tar_file; tar xzf $diffdir/rsync-$lastversion.tar.gz";
 ## TWEAK THE VERSIONS AS DESIRED HERE ##
 #mkdir("rsync-$lastversion/support", 0755) or die $!;
 #rename("rsync-$lastversion/rsyncstats", "rsync-$lastversion/support/rsyncstats");
-unlink("rsync-$lastversion/.ignore");
+#unlink("rsync-$lastversion/.ignore");
 ## END ##
 system "diff -urN --exclude=patches rsync-$lastversion rsync-$version| gzip -9 >$diff_file";
 
@@ -310,10 +302,11 @@ system "rm -rf rsync-*";
 if ($live) {
     chdir($dest) or die $!;
     system "gpg -ba $tar_name; gpg -ba $diff_name";
-}
-
-print $break, <<EOT;
+    print $break, <<EOT;
 
 All done.  Remember to announce the release on *BOTH*
 rsync-announce\@lists.samba.org and rsync\@lists.samba.org!
 EOT
+} else {
+    print $break, "All done.\n";
+}