(no commit message)

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index d8e848f8727c5dbfd11bc0f9ce976e0821b68cff..5c2d710b9c75e1eb045b70c1f5930a96865aab89 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -19,7 +19,17 @@ sub getconfig () { #{{{
                eval q{use Getopt::Long};
                Getopt::Long::Configure('pass_through');
                GetOptions(
-                       "setup|s=s" => \$config{setup},
+                       "setup|s=s" => sub {
+                               require IkiWiki::Setup;
+                               my $verbose=$config{verbose};
+                               my $syslog=$config{syslog};
+                               IkiWiki::Setup::load($_[1]);
+                               $config{setupverbose}=$config{verbose};
+                               $config{setupsyslog}=$config{syslog};
+                               $config{verbose}=$verbose;
+                               $config{syslog}=$syslog;
+                               $config{setup}=1;
+                       },
                        "dumpsetup|s=s" => \$config{dumpsetup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
@@ -105,6 +115,7 @@ sub getconfig () { #{{{
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }
+               delete $ENV{WRAPPED_OPTIONS};
                loadplugins();
                checkconfig();
        }
@@ -114,9 +125,7 @@ sub main () { #{{{
        getconfig();
        
        if ($config{setup}) {
-               require IkiWiki::Setup;
-               IkiWiki::Setup::load($config{setup});
-               
+               delete $config{setup};
                loadplugins();
                checkconfig();
 
@@ -126,15 +135,13 @@ sub main () { #{{{
                        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 => 0,
-                                       %{$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;
@@ -148,13 +155,10 @@ sub main () { #{{{
                if (! $config{refresh}) {
                        $config{rebuild}=1;
                }
-               
-               # ignore syslog setting from setup file
-               # while doing initial setup
-               $config{syslog}=0 unless $config{dumpsetup};
        }
 
        if ($config{dumpsetup}) {
+               $config{srdir}=$config{destdir}="";
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }