X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/604037b0f258f91c323c07ff985e8732a6d73e86..8bf0b3606ba73b7ec9b77806b93b2ea1005f8af6:/IkiWiki/Plugin/rsync.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm index 70dd5a4c9..e38801e4a 100644 --- a/IkiWiki/Plugin/rsync.pm +++ b/IkiWiki/Plugin/rsync.pm @@ -7,7 +7,8 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "rsync", call => \&getsetup); - hook(type => "postrefresh", id => "rsync", call => \&postrefresh); + hook(type => "change", id => "rsync", call => \&postrefresh); + hook(type => "delete", id => "rsync", call => \&postrefresh); } sub getsetup () { @@ -18,20 +19,25 @@ 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, }, } +my $ran=0; + sub postrefresh () { - if (defined $config{rsync_command}) { + if (defined $config{rsync_command} && ! $ran) { + $ran=1; + chdir($config{destdir}) || error("chdir: $!"); system $config{rsync_command}; if ($? == -1) { - warn("failed to execute rsync_command: $!"); - } elsif ($? != 0) { - warn(sprintf("rsync_command exited %d", $? >> 8)); + warn(sprintf(gettext("failed to execute rsync_command: %s"), $!))."\n"; + } + elsif ($? != 0) { + warn(sprintf(gettext("rsync_command exited %d"), $? >> 8))."\n"; } } }