]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - ikiwiki.in
Add a suggestion
[git.ikiwiki.info.git] / ikiwiki.in
index d8e848f8727c5dbfd11bc0f9ce976e0821b68cff..e0a657cda6e5a32457ff5683a113c0a08f56b8ec 100755 (executable)
@@ -19,7 +19,11 @@ sub getconfig () { #{{{
                eval q{use Getopt::Long};
                Getopt::Long::Configure('pass_through');
                GetOptions(
                eval q{use Getopt::Long};
                Getopt::Long::Configure('pass_through');
                GetOptions(
-                       "setup|s=s" => \$config{setup},
+                       "setup|s=s" => sub {
+                               require IkiWiki::Setup;
+                               IkiWiki::Setup::load($_[1]);
+                               $config{setup}=1;
+                       },
                        "dumpsetup|s=s" => \$config{dumpsetup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "dumpsetup|s=s" => \$config{dumpsetup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
@@ -105,6 +109,7 @@ sub getconfig () { #{{{
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }
+               delete $ENV{WRAPPED_OPTIONS};
                loadplugins();
                checkconfig();
        }
                loadplugins();
                checkconfig();
        }
@@ -114,9 +119,7 @@ sub main () { #{{{
        getconfig();
        
        if ($config{setup}) {
        getconfig();
        
        if ($config{setup}) {
-               require IkiWiki::Setup;
-               IkiWiki::Setup::load($config{setup});
-               
+               delete $config{setup};
                loadplugins();
                checkconfig();
 
                loadplugins();
                checkconfig();
 
@@ -132,7 +135,7 @@ sub main () { #{{{
                        foreach my $wrapper (@wrappers) {
                                %config=(%origconfig,
                                        rebuild => 0,
                        foreach my $wrapper (@wrappers) {
                                %config=(%origconfig,
                                        rebuild => 0,
-                                       verbose => 0,
+                                       verbose => undef,
                                        %{$wrapper},
                                );
                                checkconfig();
                                        %{$wrapper},
                                );
                                checkconfig();
@@ -148,10 +151,6 @@ sub main () { #{{{
                if (! $config{refresh}) {
                        $config{rebuild}=1;
                }
                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}) {
        }
 
        if ($config{dumpsetup}) {