* mercurial: Fix rcs_getctime (thanks, bma)

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index b8acd61ea2c508d12e788764e01a1e3fc724e5ff..2aeaf94ecedc4ffd210d9c774dab983a58050f2d 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -30,7 +30,6 @@ sub getconfig () { #{{{
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},
                        "getctime" => \$config{getctime},
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},
                        "getctime" => \$config{getctime},

-                       "wrappermode=i" => \$config{wrappermode},

                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "no-rcs" => sub { $config{rcs}="" },


@@ -49,6 +48,8 @@ sub getconfig () { #{{{
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
                        "userdir=s" => \$config{userdir},
                        "sslcookie!" => \$config{sslcookie},
                        "httpauth!" => \$config{httpauth},
                        "userdir=s" => \$config{userdir},

+                       "htmlext=s" => \$config{htmlext},
+                       "libdir=s" => \$config{libdir},

                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },
                        "exclude=s@" => sub {
                                push @{$config{wiki_file_prune_regexps}}, $_[1];
                        },


@@ -62,7 +63,10 @@ sub getconfig () { #{{{
                                $config{underlaydir}=possibly_foolish_untaint($_[1])
                        },
                        "wrapper:s" => sub {
                                $config{underlaydir}=possibly_foolish_untaint($_[1])
                        },
                        "wrapper:s" => sub {

-                               $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap"
+                               $config{wrapper}=$_[1] ? possibly_foolish_untaint($_[1]) : "ikiwiki-wrap"
+                       },
+                       "wrappermode=i" => sub {
+                               $config{wrappermode}=possibly_foolish_untaint($_[1])

                        },
                        "plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];
                        },
                        "plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];


@@ -73,6 +77,13 @@ sub getconfig () { #{{{
                        "pingurl=s" => sub {
                                push @{$config{pingurl}}, $_[1];
                        },
                        "pingurl=s" => sub {
                                push @{$config{pingurl}}, $_[1];
                        },

+                       "set=s" => sub {
+                               my ($var, $val)=split('=', $_[1], 2);
+                               if (! defined $var || ! defined $val) {
+                                       die gettext("usage: --set var=value"), "\n";
+                               }
+                               $config{$var}=$val;
+                       },

                        "version" => sub {
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        "version" => sub {
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;


@@ -102,12 +113,7 @@ sub getconfig () { #{{{
 sub main () { #{{{
        getconfig();
        
 sub main () { #{{{
        getconfig();
        

-       if ($config{cgi}) {
-               loadindex();
-               require IkiWiki::CGI;
-               cgi();
-       }
-       elsif ($config{setup}) {
+       if ($config{setup}) {

                require IkiWiki::Setup;
                setup();
        }
                require IkiWiki::Setup;
                setup();
        }


@@ -116,6 +122,11 @@ sub main () { #{{{
                require IkiWiki::Wrapper;
                gen_wrapper();
        }
                require IkiWiki::Wrapper;
                gen_wrapper();
        }

+       elsif ($config{cgi}) {
+               loadindex();
+               require IkiWiki::CGI;
+               cgi();
+       }

        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();
        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();