Handle the very latest spot for the nightly dir.

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

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 6ea48d4..af9f53a 100755 (executable)
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -14,8 +14,8 @@ use strict;
 use Getopt::Long;
 use Date::Format;
 
-# Where the local copy of /home/ftp/pub/rsync/nightly should be updated.
-our $dest = $ENV{HOME} . '/samba-rsync-ftp/nightly';
+# Where the local copy of /home/ftp/pub/rsync/dev/nightly should be updated.
+our $dest = $ENV{HOME} . '/samba-rsync-ftp/dev/nightly';
 our $nightly_symlink = "$dest/rsync-HEAD.tar.gz";
 
 our($make_tar, $upload, $help_opt);
@@ -41,6 +41,7 @@ if ($make_tar) {
     close IN;
     die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to commit \(working directory clean\)/;
     die "The checkout is not on the master branch.\n" unless $status =~ /^# On branch master\n/;
+    system "make $gen_target" and die "make $gen_target failed!\n";
 
     my @extra_files;
     open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
@@ -56,7 +57,7 @@ if ($make_tar) {
     close IN;
 
     print "Creating $name.tar.gz\n";
-    system "make $gen_target; rsync -a @extra_files $name/";
+    system "rsync -a @extra_files $name/";
     system "git archive --format=tar --prefix=$name/ HEAD | tar xf -";
     system "support/git-set-file-times --prefix=$name/";
     system "fakeroot tar czf $dest/$name.tar.gz $name; rm -rf $name";
@@ -103,7 +104,7 @@ if ($upload) {
     if (defined $ENV{RSYNC_PARTIAL_DIR}) {
        $opt = " -f 'R $ENV{RSYNC_PARTIAL_DIR}'";
     }
-    system "rsync$opt -aviHP --delete-after . samba.org:/home/ftp/pub/rsync/nightly";
+    system "rsync$opt -aviHP --delete-after . samba.org:/home/ftp/pub/rsync/dev/nightly";
 }
 
 exit;