(no commit message)

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

diff --git a/ikiwiki.in b/ikiwiki.in
index cb9e3c347814db4bdc859abbb719330745c61075..973ae3b3181df334c3b090d1fb433c326d4748d9 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 () { #{{{
@@ -94,6 +95,7 @@ sub getconfig () { #{{{
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
+                       "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
                if (! $config{setup} && ! $config{render}) {
@@ -182,7 +184,7 @@ sub main () { #{{{
                # do nothing
        }
        else {
-               if (! $config{refresh}) {
+               if ($config{rebuild}}) {
                        debug(gettext("rebuilding wiki.."));
                }
                else {