fix --setup --render

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

diff --git a/ikiwiki.in b/ikiwiki.in
index d601d2739e64bdba76cfd5a852d18a36876d12ec..d2f5d48dcc85889090f87b22c5684b81844f6d28 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -119,16 +119,6 @@ sub getconfig () { #{{{
                }
                delete $ENV{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();
        }


@@ -166,13 +156,14 @@ sub main () { #{{{
                }
                
                # setup implies a wiki rebuild by default
                }
                
                # 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{rebuild}=1;
                }
        }
 
        if ($config{dumpsetup}) {
                $config{srdir}=$config{destdir}="";

+               $config{syslog}=1 if $config{setupsyslog};

                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }