Merge commit 'upstream/master' into pub/master

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

diff --git a/ikiwiki.in b/ikiwiki.in
index 60663bc89cdf8e0283da54a4d7f0014f627582dd..1a6d18a6089b8e98cb83433e1c5ada1a6f26c917 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -98,7 +98,7 @@ sub getconfig () { #{{{
                        "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
-               if (! $config{setup} && ! $config{render}) {
+               if (! $config{setup}) {
                        loadplugins();
                        if (@ARGV == 2) {
                                $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
@@ -119,16 +119,6 @@ sub getconfig () { #{{{
                }
                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();
        }
@@ -156,7 +146,8 @@ sub main () { #{{{
                                        if exists $config{setupsyslog};
                                delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
                                checkconfig();
-                               if (! $config{cgi} && ! $config{post_commit}) {
+                               if (! $config{cgi} && ! $config{post_commit} &&
+                                   ! $config{test_receive}) {
                                        $config{post_commit}=1;
                                }
                                gen_wrapper();
@@ -165,13 +156,14 @@ sub main () { #{{{
                }
                
                # setup implies a wiki rebuild by default
-               if (! $config{refresh}) {
+               if (! $config{refresh} && ! $config{render}) {
                        $config{rebuild}=1;
                }
        }
 
        if ($config{dumpsetup}) {
                $config{srdir}=$config{destdir}="";
+               $config{syslog}=1 if $config{setupsyslog};
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }