web commit by joey

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index af90d22880a6a126e15fe16eb1f4d1014294d320..745dfddd4ca870376844d913516d5962e2682f8e 100755 (executable)
--- 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();
        }
 } #}}}