"render=s" => \$config{render},
"wrappers!" => \$config{wrappers},
"usedirs!" => \$config{usedirs},
+ "prefix-directives!" => \$config{prefix_directives},
"getctime" => \$config{getctime},
- "wrappermode=i" => \$config{wrappermode},
"numbacklinks=i" => \$config{numbacklinks},
"rcs=s" => \$config{rcs},
"no-rcs" => sub { $config{rcs}="" },
"cgi!" => \$config{cgi},
"discussion!" => \$config{discussion},
"w3mmode!" => \$config{w3mmode},
- "notify!" => \$config{notify},
"url=s" => \$config{url},
"cgiurl=s" => \$config{cgiurl},
"historyurl=s" => \$config{historyurl},
"diffurl=s" => \$config{diffurl},
- "svnrepo" => \$config{svnrepo},
"svnpath" => \$config{svnpath},
"adminemail=s" => \$config{adminemail},
"timeformat=s" => \$config{timeformat},
"httpauth!" => \$config{httpauth},
"userdir=s" => \$config{userdir},
"htmlext=s" => \$config{htmlext},
- "libdir" => \$config{libdir},
+ "libdir=s" => \$config{libdir},
"exclude=s@" => sub {
push @{$config{wiki_file_prune_regexps}}, $_[1];
},
$config{underlaydir}=possibly_foolish_untaint($_[1])
},
"wrapper:s" => sub {
- $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
+ $config{wrapper}=$_[1] ? possibly_foolish_untaint($_[1]) : "ikiwiki-wrap"
+ },
+ "wrappermode=i" => sub {
+ $config{wrappermode}=possibly_foolish_untaint($_[1])
},
"plugin=s@" => sub {
push @{$config{plugin}}, $_[1];
"pingurl=s" => sub {
push @{$config{pingurl}}, $_[1];
},
+ "set=s" => sub {
+ my ($var, $val)=split('=', $_[1], 2);
+ if (! defined $var || ! defined $val) {
+ die gettext("usage: --set var=value"), "\n";
+ }
+ $config{$var}=$val;
+ },
"version" => sub {
print "ikiwiki version $IkiWiki::version\n";
exit;
sub main () { #{{{
getconfig();
- if ($config{cgi}) {
- loadindex();
- require IkiWiki::CGI;
- cgi();
- }
- elsif ($config{setup}) {
+ if ($config{setup}) {
require IkiWiki::Setup;
setup();
}
require IkiWiki::Wrapper;
gen_wrapper();
}
+ elsif ($config{cgi}) {
+ require IkiWiki::CGI;
+ eval {cgi()};
+ if ($@) {
+ cgierror($@);
+ }
+ }
elsif ($config{render}) {
require IkiWiki::Render;
commandline_render();
}
elsif ($config{post_commit} && ! commit_hook_enabled()) {
- if ($config{notify}) {
- loadindex();
- rcs_notify();
- }
+ # do nothing
}
else {
lockwiki();
require IkiWiki::Render;
rcs_update();
refresh();
- rcs_notify() if $config{notify};
saveindex();
}
} #}}}