X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/12422e98901cef2774b15ec0e6468e88d4d0a6c6..60ff28e46d2aabae03e55bf39b643648d95c2341:/ikiwiki?ds=inline

diff --git a/ikiwiki b/ikiwiki
index af90d2288..745dfddd4 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -34,7 +34,6 @@ sub getconfig () { #{{{
 			rebuild => 0,
 			refresh => 0,
 			getctime => 0,
-			hyperestraier => 0,
 			wrapper => undef,
 			wrappermode => undef,
 			svnrepo => undef,
@@ -47,6 +46,7 @@ sub getconfig () { #{{{
 			adminuser => undef,
 			adminemail => undef,
 			plugin => [qw{inline}],
+			headercontent => '',
 		);
 
 		eval q{use Getopt::Long};
@@ -61,7 +61,6 @@ sub getconfig () { #{{{
 			"rcs=s" => \$config{rcs},
 			"no-rcs" => sub { $config{rcs}="" },
 			"anonok!" => \$config{anonok},
-			"hyperestraier" => \$config{hyperestraier},
 			"rss!" => \$config{rss},
 			"cgi!" => \$config{cgi},
 			"notify!" => \$config{notify},
@@ -72,8 +71,6 @@ sub getconfig () { #{{{
 			"diffurl=s" => \$config{diffurl},
 			"svnrepo" => \$config{svnrepo},
 			"svnpath" => \$config{svnpath},
-			"rcs=s" => \$config{rcs},
-			"no-rcs" => sub { $config{rcs}="" },
 			"adminemail=s" => \$config{adminemail},
 			"exclude=s@" => sub {
 				$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
@@ -106,6 +103,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();
 	}
 } #}}}