Remember to run all the tests before committing!

[git.ikiwiki.info.git] / IkiWiki / Plugin / rsync.pm

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 3f049457bd204fd12feaf5371f6050a203386328..e38801e4a110b0b9e4790935de65f08bce30441e 100644 (file)
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -7,8 +7,8 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "getsetup", id => "rsync", call => \&getsetup);
-       hook(type => "checkconfig", id => "rsync", call => \&checkconfig);
-       hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
+       hook(type => "change", id => "rsync", call => \&postrefresh);
+       hook(type => "delete", id => "rsync", call => \&postrefresh);
 }
 
 sub getsetup () {
@@ -19,26 +19,26 @@ sub getsetup () {
                },
                rsync_command => {
                        type => "string",
-                       example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
-                       description => "unattended command to upload regenerated pages",
+                       example => "rsync -qa --delete . user\@host:/path/to/docroot/",
+                       description => "command to run to sync updated pages",
                        safe => 0,
                        rebuild => 0,
                },
 }
 
-sub checkconfig {
-       if (! exists $config{rsync_command} ||
-           ! defined $config{rsync_command}) {
-               error("Must specify rsync_command");
-       }
-}
+my $ran=0;
 
 sub postrefresh () {
-       system $config{rsync_command};
-       if ($? == -1) {
-               error("failed to execute rsync_command: $!");
-       } elsif ($? != 0) {
-               error(sprintf("rsync_command exited %d", $? >> 8));
+       if (defined $config{rsync_command} && ! $ran) {
+               $ran=1;
+               chdir($config{destdir}) || error("chdir: $!");
+               system $config{rsync_command};
+               if ($? == -1) {
+                       warn(sprintf(gettext("failed to execute rsync_command: %s"), $!))."\n";
+               }
+               elsif ($? != 0) {
+                       warn(sprintf(gettext("rsync_command exited %d"), $? >> 8))."\n";
+               }
        }
 }