X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/642f73a39fa5249e01b384cda24e44bfb805e971..9fa5eebfb9a949d64b9922920d5ae275b5eb383a:/ikiwiki diff --git a/ikiwiki b/ikiwiki index 4801c5f92..61b66374d 100755 --- a/ikiwiki +++ b/ikiwiki @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl -T -CSD $ENV{PATH}="/usr/local/bin:/usr/bin:/bin"; package IkiWiki; @@ -28,8 +28,8 @@ sub getconfig () { #{{{ "anonok!" => \$config{anonok}, "rss!" => \$config{rss}, "cgi!" => \$config{cgi}, + "discussion!" => \$config{discussion}, "notify!" => \$config{notify}, - "sanitize!" => \$config{sanitize}, "url=s" => \$config{url}, "cgiurl=s" => \$config{cgiurl}, "historyurl=s" => \$config{historyurl}, @@ -37,6 +37,7 @@ sub getconfig () { #{{{ "svnrepo" => \$config{svnrepo}, "svnpath" => \$config{svnpath}, "adminemail=s" => \$config{adminemail}, + "timeformat=s" => \$config{timeformat}, "exclude=s@" => sub { $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/; }, @@ -54,7 +55,10 @@ sub getconfig () { #{{{ }, "plugin=s@" => sub { push @{$config{plugin}}, $_[1]; - } + }, + "disable-plugin=s@" => sub { + $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}} ]; + }, ) || usage(); if (! $config{setup}) { @@ -98,7 +102,6 @@ sub main () { #{{{ loadindex(); require IkiWiki::Render; rcs_update(); - rcs_getctime() if $config{getctime}; refresh(); rcs_notify() if $config{notify}; saveindex();