anon push test

[git.ikiwiki.info.git] / doc / plugins / contrib / irker.mdwn

diff --git a/doc/plugins/contrib/irker.mdwn b/doc/plugins/contrib/irker.mdwn
index bbc24e57d36f7dc95e5b26fc5bf08a39093fe720..9e1dabf7dd7abcbf7bd47dcb1e88ef120397709a 100644 (file)
--- a/doc/plugins/contrib/irker.mdwn
+++ b/doc/plugins/contrib/irker.mdwn
@@ -3,7 +3,7 @@
 
 This plugin will configure your wiki to send IRC notifications using the [irker](http://www.catb.org/esr/irker/) notification bot.
 
 
 This plugin will configure your wiki to send IRC notifications using the [irker](http://www.catb.org/esr/irker/) notification bot.
 

-It is fairly simple and requires no configuration but installation of the irker package. For template configuration, patches from [Debian bug #824512](https://bugs.debian.org/824512) are necessary.
+It is fairly simple and requires no configuration but installation of the irker package. For template configuration, patches from [Debian bug #824512](https://bugs.debian.org/824512) are necessary. Note that they have been factored into irker 2.18.

 
 [[!format perl """
 package IkiWiki::Plugin::irker;
 
 [[!format perl """
 package IkiWiki::Plugin::irker;


@@ -108,14 +108,14 @@ sub genwrapper() {
             symlink($config{'irker_hook'}, $repo . '/hooks/post-receive') || error('failed to symlink: $!');
         }
         my $channels = join(",", @{$config{'irker_channels'}});
             symlink($config{'irker_hook'}, $repo . '/hooks/post-receive') || error('failed to symlink: $!');
         }
         my $channels = join(",", @{$config{'irker_channels'}});

-        exec { 'git' } ('config', '-C', $repo, 'config', 'irker.channels', $channels);
-        exec { 'git' } ('config', '-C', $repo, 'config', 'irker.channels', $config{'wikiname'});
+        system { 'git' } ('config', '-C', $repo, 'config', 'irker.channels', $channels);
+        system { 'git' } ('config', '-C', $repo, 'config', 'irker.channels', $config{'wikiname'});

         if ($config{'irker_template'}) {
             exec { 'git' } ('config', '-C', $repo, 'config', 'irker.channels', $config{'irker_template'});
         }
     }
     else {
         if ($config{'irker_template'}) {
             exec { 'git' } ('config', '-C', $repo, 'config', 'irker.channels', $config{'irker_template'});
         }
     }
     else {

-        exec { 'git' } ('config', '-C', $repo, 'config', '--remove-section', 'irker');
+        system { 'git' } ('config', '-C', $repo, 'config', '--remove-section', 'irker');

         if (-l $repo . '/hooks/post-receive' && 
             readlink($repo . '/hooks/post-receive') =~ m/irkerhook/) {
             unlink($repo . '/hooks/post-receive');
         if (-l $repo . '/hooks/post-receive' && 
             readlink($repo . '/hooks/post-receive') =~ m/irkerhook/) {
             unlink($repo . '/hooks/post-receive');