Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index ddbd710568d67d61cd3aecd3c9970b298e514edf..878d3506519a02e496fdb13564c4591a8d6fb0ea 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -19,7 +19,11 @@ 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;
+                               IkiWiki::Setup::load($_[1]);
+                               $config{setup}=1;
+                       },
                        "dumpsetup|s=s" => \$config{dumpsetup},
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
@@ -115,9 +119,7 @@ sub main () { #{{{
        getconfig();
        
        if ($config{setup}) {
-               require IkiWiki::Setup;
-               IkiWiki::Setup::load($config{setup});
-               
+               delete $config{setup};
                loadplugins();
                checkconfig();
 
@@ -149,13 +151,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});
        }