typo

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

diff --git a/ikiwiki.in b/ikiwiki.in
index e0a657cda6e5a32457ff5683a113c0a08f56b8ec..4f24cfc2eb8ae4c53d7c0f471fbf12aea13c0578 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 () { #{{{
 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 () { #{{{
 } #}}}
 
 sub getconfig () { #{{{


@@ -21,7 +22,13 @@ sub getconfig () { #{{{
                GetOptions(
                        "setup|s=s" => sub {
                                require IkiWiki::Setup;
                GetOptions(
                        "setup|s=s" => sub {
                                require IkiWiki::Setup;

+                               my $verbose=$config{verbose};
+                               my $syslog=$config{syslog};

                                IkiWiki::Setup::load($_[1]);
                                IkiWiki::Setup::load($_[1]);

+                               $config{setupverbose}=$config{verbose};
+                               $config{setupsyslog}=$config{syslog};
+                               $config{verbose}=$verbose || $config{setupverbose};
+                               $config{syslog}=$syslog;

                                $config{setup}=1;
                        },
                        "dumpsetup|s=s" => \$config{dumpsetup},
                                $config{setup}=1;
                        },
                        "dumpsetup|s=s" => \$config{dumpsetup},


@@ -88,6 +95,7 @@ sub getconfig () { #{{{
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },

+                       "help|h" => sub { $SIG{__WARN__}=sub {}; die },

                ) || usage();
 
                if (! $config{setup} && ! $config{render}) {
                ) || usage();
 
                if (! $config{setup} && ! $config{render}) {


@@ -129,15 +137,13 @@ sub main () { #{{{
                        debug(gettext("generating wrappers.."));
                        require IkiWiki::Wrapper;
                        my %origconfig=(%config);
                        debug(gettext("generating wrappers.."));
                        require IkiWiki::Wrapper;
                        my %origconfig=(%config);

-                       my @wrappers=@{$config{wrappers}};
-                       delete $config{wrappers};
-                       delete $config{genwrappers};
-                       foreach my $wrapper (@wrappers) {
-                               %config=(%origconfig,
-                                       rebuild => 0,
-                                       verbose => undef,
-                                       %{$wrapper},
-                               );
+                       foreach my $wrapper (@{$config{wrappers}}) {
+                               %config=(%origconfig, %{$wrapper});
+                               $config{verbose}=$config{setupverbose}
+                                       if exists $config{setupverbose};
+                               $config{syslog}=$config{setupsyslog}
+                                       if exists $config{setupsyslog};
+                               delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};

                                checkconfig();
                                if (! $config{cgi} && ! $config{post_commit}) {
                                        $config{post_commit}=1;
                                checkconfig();
                                if (! $config{cgi} && ! $config{post_commit}) {
                                        $config{post_commit}=1;


@@ -154,6 +160,7 @@ sub main () { #{{{
        }
 
        if ($config{dumpsetup}) {
        }
 
        if ($config{dumpsetup}) {

+               $config{srdir}=$config{destdir}="";

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


@@ -177,7 +184,7 @@ sub main () { #{{{
                # do nothing
        }
        else {
                # do nothing
        }
        else {

-               if (! $config{refresh}) {
+               if ($config{rebuild}) {

                        debug(gettext("rebuilding wiki.."));
                }
                else {
                        debug(gettext("rebuilding wiki.."));
                }
                else {