Merge commit 'origin/master'

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 2aeaf94ecedc4ffd210d9c774dab983a58050f2d..1a6d18a6089b8e98cb83433e1c5ada1a6f26c917 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -10,7 +10,8 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
 use IkiWiki;
 
 sub usage () { #{{{

-       die gettext("usage: ikiwiki [options] source dest"), "\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n",
+           gettext("       ikiwiki --setup configfile"), "\n";

 } #}}}
 
 sub getconfig () { #{{{
 } #}}}
 
 sub getconfig () { #{{{


@@ -19,7 +20,18 @@ sub getconfig () { #{{{
                eval q{use Getopt::Long};
                Getopt::Long::Configure('pass_through');
                GetOptions(
                eval q{use Getopt::Long};
                Getopt::Long::Configure('pass_through');
                GetOptions(

-                       "setup|s=s" => \$config{setup},
+                       "setup|s=s" => sub {
+                               require IkiWiki::Setup;
+                               my $verbose=$config{verbose};
+                               my $syslog=$config{syslog};
+                               IkiWiki::Setup::load($_[1]);
+                               $config{setupverbose}=$config{verbose};
+                               $config{setupsyslog}=$config{syslog};
+                               $config{verbose}=$verbose || $config{setupverbose};
+                               $config{syslog}=$syslog;
+                               $config{setup}=1;
+                       },
+                       "dumpsetup|s=s" => \$config{dumpsetup},

                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "syslog!" => \$config{syslog},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "syslog!" => \$config{syslog},


@@ -27,8 +39,9 @@ sub getconfig () { #{{{
                        "refresh!" => \$config{refresh},
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},
                        "refresh!" => \$config{refresh},
                        "post-commit" => \$config{post_commit},
                        "render=s" => \$config{render},

-                       "wrappers!" => \$config{wrappers},
+                       "wrappers!" => \$config{genwrappers},

                        "usedirs!" => \$config{usedirs},
                        "usedirs!" => \$config{usedirs},

+                       "prefix-directives!" => \$config{prefix_directives},

                        "getctime" => \$config{getctime},
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},
                        "getctime" => \$config{getctime},
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},


@@ -36,17 +49,14 @@ sub getconfig () { #{{{
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},
                        "cgi!" => \$config{cgi},
                        "discussion!" => \$config{discussion},
                        "w3mmode!" => \$config{w3mmode},

-                       "notify!" => \$config{notify},

                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
                        "diffurl=s" => \$config{diffurl},

-                       "svnrepo" => \$config{svnrepo},

                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},
                        "svnpath" => \$config{svnpath},
                        "adminemail=s" => \$config{adminemail},
                        "timeformat=s" => \$config{timeformat},
                        "sslcookie!" => \$config{sslcookie},

-                       "httpauth!" => \$config{httpauth},

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


@@ -69,14 +79,11 @@ sub getconfig () { #{{{
                                $config{wrappermode}=possibly_foolish_untaint($_[1])
                        },
                        "plugin=s@" => sub {
                                $config{wrappermode}=possibly_foolish_untaint($_[1])
                        },
                        "plugin=s@" => sub {

-                               push @{$config{plugin}}, $_[1];
+                               push @{$config{add_plugins}}, $_[1];

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

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

                        "set=s" => sub {
                                my ($var, $val)=split('=', $_[1], 2);
                                if (! defined $var || ! defined $val) {
                        "set=s" => sub {
                                my ($var, $val)=split('=', $_[1], 2);
                                if (! defined $var || ! defined $val) {


@@ -88,14 +95,19 @@ sub getconfig () { #{{{
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },

+                       "help|h" => sub { $SIG{__WARN__}=sub {}; die },

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

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

                        loadplugins();
                        loadplugins();

-                       usage() unless @ARGV == 2;
-                       $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
-                       $config{destdir} = possibly_foolish_untaint(shift @ARGV);
-                       checkconfig();
+                       if (@ARGV == 2) {
+                               $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
+                               $config{destdir} = possibly_foolish_untaint(shift @ARGV);
+                               checkconfig();
+                       }
+                       else {
+                               usage() unless $config{dumpsetup};
+                       }

                }
        }
        else {
                }
        }
        else {


@@ -105,6 +117,8 @@ sub getconfig () { #{{{
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }

+               delete $ENV{WRAPPED_OPTIONS};
+

                loadplugins();
                checkconfig();
        }
                loadplugins();
                checkconfig();
        }


@@ -114,8 +128,44 @@ sub main () { #{{{
        getconfig();
        
        if ($config{setup}) {
        getconfig();
        
        if ($config{setup}) {

+               delete $config{setup};
+               loadplugins();
+               checkconfig();
+
+               if (@{$config{wrappers}} && 
+                   ! $config{render} && ! $config{dumpsetup} &&
+                   (! $config{refresh} || $config{genwrappers})) {
+                       debug(gettext("generating wrappers.."));
+                       require IkiWiki::Wrapper;
+                       my %origconfig=(%config);
+                       foreach my $wrapper (@{$config{wrappers}}) {
+                               %config=(%origconfig, %{$wrapper});
+                               $config{verbose}=$config{setupverbose}
+                                       if exists $config{setupverbose};
+                               $config{syslog}=$config{setupsyslog}
+                                       if exists $config{setupsyslog};
+                               delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
+                               checkconfig();
+                               if (! $config{cgi} && ! $config{post_commit} &&
+                                   ! $config{test_receive}) {
+                                       $config{post_commit}=1;
+                               }
+                               gen_wrapper();
+                       }
+                       %config=(%origconfig);
+               }
+               
+               # setup implies a wiki rebuild by default
+               if (! $config{refresh} && ! $config{render}) {
+                       $config{rebuild}=1;
+               }
+       }
+
+       if ($config{dumpsetup}) {
+               $config{srdir}=$config{destdir}="";
+               $config{syslog}=1 if $config{setupsyslog};

                require IkiWiki::Setup;
                require IkiWiki::Setup;

-               setup();
+               IkiWiki::Setup::dump($config{dumpsetup});

        }
        elsif ($config{wrapper}) {
                lockwiki();
        }
        elsif ($config{wrapper}) {
                lockwiki();


@@ -123,28 +173,37 @@ sub main () { #{{{
                gen_wrapper();
        }
        elsif ($config{cgi}) {
                gen_wrapper();
        }
        elsif ($config{cgi}) {

-               loadindex();

                require IkiWiki::CGI;
                require IkiWiki::CGI;

-               cgi();
+               eval {cgi()};
+               if ($@) {
+                       cgierror($@);
+               }

        }
        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
        }
        elsif ($config{render}) {
                require IkiWiki::Render;
                commandline_render();
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {

-               if ($config{notify}) {
-                       loadindex();
-                       rcs_notify();
-               }
+               # do nothing
+       }
+       elsif ($config{test_receive}) {
+               require IkiWiki::Receive;
+               IkiWiki::Receive::test();

        }
        else {
        }
        else {

+               if ($config{rebuild}) {
+                       debug(gettext("rebuilding wiki.."));
+               }
+               else {
+                       debug(gettext("refreshing wiki.."));
+               }

                lockwiki();
                loadindex();
                require IkiWiki::Render;
                rcs_update();
                refresh();
                lockwiki();
                loadindex();
                require IkiWiki::Render;
                rcs_update();
                refresh();

-               rcs_notify() if $config{notify};

                saveindex();
                saveindex();

+               debug(gettext("done"));

        }
 } #}}}
 
        }
 } #}}}