more work on untrusted committers

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

diff --git a/ikiwiki.in b/ikiwiki.in
index 5c2d710b9c75e1eb045b70c1f5930a96865aab89..60663bc89cdf8e0283da54a4d7f0014f627582dd 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 () { #{{{


@@ -26,7 +27,7 @@ sub getconfig () { #{{{
                                IkiWiki::Setup::load($_[1]);
                                $config{setupverbose}=$config{verbose};
                                $config{setupsyslog}=$config{syslog};
                                IkiWiki::Setup::load($_[1]);
                                $config{setupverbose}=$config{verbose};
                                $config{setupsyslog}=$config{syslog};

-                               $config{verbose}=$verbose;
+                               $config{verbose}=$verbose || $config{setupverbose};

                                $config{syslog}=$syslog;
                                $config{setup}=1;
                        },
                                $config{syslog}=$syslog;
                                $config{setup}=1;
                        },


@@ -94,6 +95,7 @@ sub getconfig () { #{{{
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },

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

                ) || usage();
 
                if (! $config{setup} && ! $config{render}) {
                ) || usage();
 
                if (! $config{setup} && ! $config{render}) {


@@ -116,6 +118,17 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};

+
+               if ($config{post_commit} && ! commit_hook_enabled()) {
+                       # optimisation for no-op post_commit 
+                       exit 0;
+               }
+               elsif ($config{test_receive}) {
+                       # quick success if the user is trusted
+                       require IkiWiki::Receive;
+                       exit 0 if IkiWiki::Receive::trusted();
+               }
+

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


@@ -181,8 +194,12 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }

+       elsif ($config{test_receive}) {
+               require IkiWiki::Receive;
+               IkiWiki::Receive::test();
+       }

        else {
        else {

-               if (! $config{refresh}) {
+               if ($config{rebuild}) {

                        debug(gettext("rebuilding wiki.."));
                }
                else {
                        debug(gettext("rebuilding wiki.."));
                }
                else {