web commit by joey

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 75114bb662925bfa09b9f0d4a3683f11f6d41079..745dfddd4ca870376844d913516d5962e2682f8e 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -22,7 +22,7 @@ sub getconfig () { #{{{
                        wikiname => "wiki",
                        default_pageext => ".mdwn",
                        cgi => 0,
-                       svn => 1,
+                       rcs => 'svn',
                        notify => 0,
                        url => '',
                        cgiurl => '',
@@ -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};
@@ -58,9 +58,9 @@ sub getconfig () { #{{{
                        "refresh!" => \$config{refresh},
                        "getctime" => \$config{getctime},
                        "wrappermode=i" => \$config{wrappermode},
-                       "svn!" => \$config{svn},
+                       "rcs=s" => \$config{rcs},
+                       "no-rcs" => sub { $config{rcs}="" },
                        "anonok!" => \$config{anonok},
-                       "hyperestraier" => \$config{hyperestraier},
                        "rss!" => \$config{rss},
                        "cgi!" => \$config{cgi},
                        "notify!" => \$config{notify},
@@ -103,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();
        }
 } #}}}