web commit by DonMarti

[ikiwiki.git] / ikiwiki.pl

diff --git a/ikiwiki.pl b/ikiwiki.pl
index 1342ec543f3e54c216e16cb615e9493c67484e8a..6204ff194a0bc9392597f1f5429aa7abbaf5c420 100755 (executable)
--- a/ikiwiki.pl
+++ b/ikiwiki.pl
@@ -3,6 +3,7 @@ $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
 
 package IkiWiki;
 delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
 
 package IkiWiki;

+

 use warnings;
 use strict;
 use lib '.'; # For use without installation, removed by Makefile.
 use warnings;
 use strict;
 use lib '.'; # For use without installation, removed by Makefile.


@@ -21,8 +22,10 @@ sub getconfig () { #{{{
                        "setup|s=s" => \$config{setup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "setup|s=s" => \$config{setup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},

+                       "syslog!" => \$config{syslog},

                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},
                        "rebuild!" => \$config{rebuild},
                        "refresh!" => \$config{refresh},

+                       "render=s" => \$config{render},

                        "wrappers!" => \$config{wrappers},
                        "getctime" => \$config{getctime},
                        "wrappermode=i" => \$config{wrappermode},
                        "wrappers!" => \$config{wrappers},
                        "getctime" => \$config{getctime},
                        "wrappermode=i" => \$config{wrappermode},


@@ -30,6 +33,7 @@ sub getconfig () { #{{{
                        "no-rcs" => sub { $config{rcs}="" },
                        "anonok!" => \$config{anonok},
                        "rss!" => \$config{rss},
                        "no-rcs" => sub { $config{rcs}="" },
                        "anonok!" => \$config{anonok},
                        "rss!" => \$config{rss},

+                       "atom!" => \$config{atom},

                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},


@@ -42,6 +46,8 @@ sub getconfig () { #{{{
                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},

+                       "sslcookie!" => \$config{sslcookie},
+                       "httpauth!" => \$config{httpauth},

                        "exclude=s@" => sub {
                                $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
                        },
                        "exclude=s@" => sub {
                                $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
                        },


@@ -65,10 +71,14 @@ sub getconfig () { #{{{
                        },
                        "pingurl" => sub {
                                push @{$config{pingurl}}, $_[1];
                        },
                        "pingurl" => sub {
                                push @{$config{pingurl}}, $_[1];

-                       }
+                       },
+                       "version" => sub {
+                               print "ikiwiki version $IkiWiki::version\n";
+                               exit;
+                       },

                ) || usage();
 
                ) || usage();
 

-               if (! $config{setup}) {
+               if (! $config{setup} && ! $config{render}) {

                        loadplugins();
                        usage() unless @ARGV == 2;
                        $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
                        loadplugins();
                        usage() unless @ARGV == 2;
                        $config{srcdir} = possibly_foolish_untaint(shift @ARGV);


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

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

        else {
                lockwiki();
                loadindex();
        else {
                lockwiki();
                loadindex();