X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b5e2afa94390dd3349fed81f72892da3beba56ed..b96cca178db61c14e2e610e962fbfebb27df4551:/ikiwiki.in diff --git a/ikiwiki.in b/ikiwiki.in index c762712ba..c37085bbc 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -25,13 +25,15 @@ sub getconfig () { #{{{ "syslog!" => \$config{syslog}, "rebuild!" => \$config{rebuild}, "refresh!" => \$config{refresh}, + "post-commit" => \$config{post_commit}, "render=s" => \$config{render}, "wrappers!" => \$config{wrappers}, + "usedirs!" => \$config{usedirs}, "getctime" => \$config{getctime}, "wrappermode=i" => \$config{wrappermode}, + "numbacklinks=i" => \$config{numbacklinks}, "rcs=s" => \$config{rcs}, "no-rcs" => sub { $config{rcs}="" }, - "anonok!" => \$config{anonok}, "cgi!" => \$config{cgi}, "discussion!" => \$config{discussion}, "w3mmode!" => \$config{w3mmode}, @@ -46,6 +48,9 @@ sub getconfig () { #{{{ "timeformat=s" => \$config{timeformat}, "sslcookie!" => \$config{sslcookie}, "httpauth!" => \$config{httpauth}, + "userdir=s" => \$config{userdir}, + "htmlext=s" => \$config{htmlext}, + "libdir" => \$config{libdir}, "exclude=s@" => sub { push @{$config{wiki_file_prune_regexps}}, $_[1]; }, @@ -70,6 +75,13 @@ sub getconfig () { #{{{ "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; @@ -117,6 +129,12 @@ sub main () { #{{{ require IkiWiki::Render; commandline_render(); } + elsif ($config{post_commit} && ! commit_hook_enabled()) { + if ($config{notify}) { + loadindex(); + rcs_notify(); + } + } else { lockwiki(); loadindex();