po plugin: more detailed backlinks todo item

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 5c2d710b9c75e1eb045b70c1f5930a96865aab89..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 () { #{{{
-       die gettext("usage: ikiwiki [options] source dest"), "\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n",
+           gettext("       ikiwiki --setup configfile"), "\n";
 } #}}}
 
 sub getconfig () { #{{{
@@ -26,7 +27,7 @@ sub getconfig () { #{{{
                                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;
                        },
@@ -94,9 +95,10 @@ sub getconfig () { #{{{
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
+                       "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);
@@ -116,6 +118,7 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
+
                loadplugins();
                checkconfig();
        }
@@ -143,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();
@@ -152,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});
        }
@@ -181,8 +186,12 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
+       elsif ($config{test_receive}) {
+               require IkiWiki::Receive;
+               IkiWiki::Receive::test();
+       }
        else {
-               if (! $config{refresh}) {
+               if ($config{rebuild}) {
                        debug(gettext("rebuilding wiki.."));
                }
                else {