X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..c8b9fdcd26e78c9505c89b0e79fcbe80efd78282:/ikiwiki.in diff --git a/ikiwiki.in b/ikiwiki.in index 11d562523..b8acd61ea 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,7 @@ sub getconfig () { #{{{ "timeformat=s" => \$config{timeformat}, "sslcookie!" => \$config{sslcookie}, "httpauth!" => \$config{httpauth}, + "userdir=s" => \$config{userdir}, "exclude=s@" => sub { push @{$config{wiki_file_prune_regexps}}, $_[1]; }, @@ -65,7 +68,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]; @@ -117,6 +120,12 @@ sub main () { #{{{ require IkiWiki::Render; commandline_render(); } + elsif ($config{post_commit} && ! commit_hook_enabled()) { + if ($config{notify}) { + loadindex(); + rcs_notify(); + } + } else { lockwiki(); loadindex();