web commit by http://ethan.betacantrips.com/: clarification and related bug

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

diff --git a/ikiwiki.in b/ikiwiki.in
index ad25582581e38fffa807c9b6a4594c1b65ca29de..5b1f57d16314bef6add96735c2737a7170a7d2ec 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 () { #{{{
 use IkiWiki;
 
 sub usage () { #{{{

-       die "usage: ikiwiki [options] source dest\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n";

 } #}}}
 
 sub getconfig () { #{{{
 } #}}}
 
 sub getconfig () { #{{{


@@ -46,8 +46,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 +66,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];