X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b0e7e2e123079a2e68924cfb90d19c44571b1f65..3a2dfb94cbe475faa16f0329ffc5e75f330d1afa:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index f32eb4879..a10876a96 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -15,6 +15,7 @@ sub getconfig () { #{{{
 	if (! exists $ENV{WRAPPED_OPTIONS}) {
 		%config=defaultconfig();
 		eval q{use Getopt::Long};
+		Getopt::Long::Configure('pass_through');
 		GetOptions(
 			"setup|s=s" => \$config{setup},
 			"wikiname=s" => \$config{wikiname},
@@ -29,6 +30,7 @@ sub getconfig () { #{{{
 			"rss!" => \$config{rss},
 			"cgi!" => \$config{cgi},
 			"discussion!" => \$config{discussion},
+			"w3mmode!" => \$config{w3mmode},
 			"notify!" => \$config{notify},
 			"url=s" => \$config{url},
 			"cgiurl=s" => \$config{cgiurl},
@@ -57,7 +59,7 @@ sub getconfig () { #{{{
 				push @{$config{plugin}}, $_[1];
 			},
 			"disable-plugin=s@" => sub {
-				$config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}} ];
+				$config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}];
 			},
 			"pingurl" => sub {
 				push @{$config{pingurl}}, $_[1];
@@ -65,6 +67,17 @@ sub getconfig () { #{{{
 		) || usage();
 
 		if (! $config{setup}) {
+			loadplugins();
+			if (exists $hooks{getopt}) {
+				foreach my $id (keys %{$hooks{getopt}}) {
+		                        $hooks{getopt}{$id}{call}->();
+				}
+			}
+			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);
@@ -78,6 +91,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		loadplugins();
 		checkconfig();
 	}
 } #}}}