X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a2e98e7ffc50626e6259713094b3b388e8460cd1..7e3e3f5babee02559bd7145704afbd1d252f4128:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 5b4972ab7..e6c2567ba 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -13,42 +13,7 @@ sub usage () { #{{{
 
 sub getconfig () { #{{{
 	if (! exists $ENV{WRAPPED_OPTIONS}) {
-		%config=(
-			wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$|\.rss$)},
-			wiki_link_regexp => qr/\[\[(?:([^\s\]\|]+)\|)?([^\s\]]+)\]\]/,
-			wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]*)\]\]/,
-			wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
-			verbose => 0,
-			wikiname => "wiki",
-			default_pageext => ".mdwn",
-			cgi => 0,
-			rcs => 'svn',
-			notify => 0,
-			url => '',
-			cgiurl => '',
-			historyurl => '',
-			diffurl => '',
-			anonok => 0,
-			rss => 0,
-			sanitize => 1,
-			rebuild => 0,
-			refresh => 0,
-			getctime => 0,
-			hyperestraier => 0,
-			wrapper => undef,
-			wrappermode => undef,
-			svnrepo => undef,
-			svnpath => "trunk",
-			srcdir => undef,
-			destdir => undef,
-			templatedir => "/usr/share/ikiwiki/templates",
-			underlaydir => "/usr/share/ikiwiki/basewiki",
-			setup => undef,
-			adminuser => undef,
-			adminemail => undef,
-			plugin => [qw{inline}],
-		);
-
+		%config=defaultconfig();
 		eval q{use Getopt::Long};
 		GetOptions(
 			"setup|s=s" => \$config{setup},
@@ -61,11 +26,10 @@ sub getconfig () { #{{{
 			"rcs=s" => \$config{rcs},
 			"no-rcs" => sub { $config{rcs}="" },
 			"anonok!" => \$config{anonok},
-			"hyperestraier" => \$config{hyperestraier},
 			"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},
@@ -73,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]/;
 			},
@@ -90,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}) {
@@ -104,6 +72,9 @@ sub getconfig () { #{{{
 		# wrapper passes a full config structure in the environment
 		# variable
 		eval possibly_foolish_untaint($ENV{WRAPPED_OPTIONS});
+		if ($@) {
+			error("WRAPPED_OPTIONS: $@");
+		}
 		checkconfig();
 	}
 } #}}}
@@ -131,7 +102,6 @@ sub main () { #{{{
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
-		rcs_getctime() if $config{getctime};
 		refresh();
 		rcs_notify() if $config{notify};
 		saveindex();