Added syntax suggestions for accessing meta information in Ikiwiki links.

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 4f24cfc2eb8ae4c53d7c0f471fbf12aea13c0578..ca499b115ae0e758b5a7c38d2fbcc4fd4944c597 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -118,6 +118,7 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
+
                loadplugins();
                checkconfig();
        }
@@ -145,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();
@@ -161,6 +163,7 @@ sub main () { #{{{
 
        if ($config{dumpsetup}) {
                $config{srdir}=$config{destdir}="";
+               $config{syslog}=1 if $config{setupsyslog};
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }
@@ -183,6 +186,10 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
+       elsif ($config{test_receive}) {
+               require IkiWiki::Receive;
+               IkiWiki::Receive::test();
+       }
        else {
                if ($config{rebuild}) {
                        debug(gettext("rebuilding wiki.."));