X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5bc73d7facbea81ae533777affaffbe3d7476c0f..b4d5e911da7666d7d9a56bf143ee5ee6f1eab403:/ikiwiki.in diff --git a/ikiwiki.in b/ikiwiki.in index 7d13ab455..24b02bc41 100755 --- 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];