]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - ikiwiki.in
web commit by JoshTriplett: poll vote (It's fast enough)
[git.ikiwiki.info.git] / ikiwiki.in
index ad25582581e38fffa807c9b6a4594c1b65ca29de..24b02bc415f9ad73908eef2c809d2efa1111400e 100755 (executable)
@@ -10,7 +10,7 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
 use IkiWiki;
 
 sub usage () { #{{{
-       die "usage: ikiwiki [options] source dest\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n";
 } #}}}
 
 sub getconfig () { #{{{
 } #}}}
 
 sub getconfig () { #{{{
@@ -31,7 +31,6 @@ sub getconfig () { #{{{
                        "wrappermode=i" => \$config{wrappermode},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
                        "wrappermode=i" => \$config{wrappermode},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
-                       "anonok!" => \$config{anonok},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
@@ -46,8 +45,9 @@ sub getconfig () { #{{{
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
+                       "userdir=s" => \$config{userdir},
                        "exclude=s@" => sub {
                        "exclude=s@" => sub {
-                               push @{$config{wiki_file_prune_regexp}}, $_[1];
+                               push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
                        "adminuser=s@" => sub {
                                push @{$config{adminuser}}, $_[1]
                        },
                        "adminuser=s@" => sub {
                                push @{$config{adminuser}}, $_[1]
@@ -65,7 +65,7 @@ sub getconfig () { #{{{
                                push @{$config{plugin}}, $_[1];
                        },
                        "disable-plugin=s@" => sub {
                                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];
                        },
                        "pingurl=s" => sub {
                                push @{$config{pingurl}}, $_[1];