web commit from 82.236.189.224: poll vote (It's fast enough)

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 7d13ab455c60dd80a743d6fb519d1400b9e02b4b..5dd1064f9fd6900d302dcde2128f35f67cffb09d 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -10,7 +10,7 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
-       die "usage: ikiwiki [options] source dest\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n";
 } #}}}
 
 sub getconfig () { #{{{
@@ -31,9 +31,6 @@ sub getconfig () { #{{{
                        "wrappermode=i" => \$config{wrappermode},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
-                       "anonok!" => \$config{anonok},
-                       "rss!" => \$config{rss},
-                       "atom!" => \$config{atom},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
@@ -48,8 +45,9 @@ sub getconfig () { #{{{
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
+                       "userdir=s" => \$config{userdir},
                        "exclude=s@" => sub {
-                               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
+                               push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
                        "adminuser=s@" => sub {
                                push @{$config{adminuser}}, $_[1]
@@ -67,7 +65,7 @@ sub getconfig () { #{{{
                                push @{$config{plugin}}, $_[1];
                        },
                        "disable-plugin=s@" => sub {
-                               $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}];
+                               push @{$config{disable_plugins}}, $_[1];
                        },
                        "pingurl=s" => sub {
                                push @{$config{pingurl}}, $_[1];
@@ -119,6 +117,12 @@ sub main () { #{{{
                require IkiWiki::Render;
                commandline_render();
        }
+       elsif ($config{post_commit} && ! commit_hook_enabled()) {
+               if ($config{notify}) {
+                       loadindex();
+                       rcs_notify();
+               }
+       }
        else {
                lockwiki();
                loadindex();