X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/af9566ff1ae55d273ff96c7ca39e34265623a55d..e49ff966a39d1037ccbf168b8dbd12618cf1b41e:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 745dfddd4..6518b8626 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -13,49 +13,16 @@ 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,
-			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}],
-			headercontent => '',
-		);
-
+		%config=defaultconfig();
 		eval q{use Getopt::Long};
+		Getopt::Long::Configure('pass_through');
 		GetOptions(
 			"setup|s=s" => \$config{setup},
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"rebuild!" => \$config{rebuild},
 			"refresh!" => \$config{refresh},
+			"wrappers!" => \$config{wrappers},
 			"getctime" => \$config{getctime},
 			"wrappermode=i" => \$config{wrappermode},
 			"rcs=s" => \$config{rcs},
@@ -63,8 +30,9 @@ sub getconfig () { #{{{
 			"anonok!" => \$config{anonok},
 			"rss!" => \$config{rss},
 			"cgi!" => \$config{cgi},
+			"discussion!" => \$config{discussion},
+			"w3mmode!" => \$config{w3mmode},
 			"notify!" => \$config{notify},
-			"sanitize!" => \$config{sanitize},
 			"url=s" => \$config{url},
 			"cgiurl=s" => \$config{cgiurl},
 			"historyurl=s" => \$config{historyurl},
@@ -72,6 +40,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]/;
 			},
@@ -89,10 +58,23 @@ sub getconfig () { #{{{
 			},
 			"plugin=s@" => sub {
 				push @{$config{plugin}}, $_[1];
+			},
+			"disable-plugin=s@" => sub {
+				$config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}];
+			},
+			"pingurl" => sub {
+				push @{$config{pingurl}}, $_[1];
 			}
 		) || usage();
 
 		if (! $config{setup}) {
+			loadplugins();
+			run_hooks(getopt => sub { shift->() });
+			if (grep /^-/, @ARGV) {
+				print STDERR "Unknown option: $_\n"
+					foreach grep /^-/, @ARGV;
+				usage();
+			}
 			usage() unless @ARGV == 2;
 			$config{srcdir} = possibly_foolish_untaint(shift @ARGV);
 			$config{destdir} = possibly_foolish_untaint(shift @ARGV);
@@ -106,6 +88,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		loadplugins();
 		checkconfig();
 	}
 } #}}}
@@ -133,7 +116,6 @@ sub main () { #{{{
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
-		rcs_getctime() if $config{getctime};
 		refresh();
 		rcs_notify() if $config{notify};
 		saveindex();