add todo/structured_page_data

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

diff --git a/ikiwiki.in b/ikiwiki.in
index febc8ff56ed42ee876b85db2b235270961737963..e0a657cda6e5a32457ff5683a113c0a08f56b8ec 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(
                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},


@@ -88,10 +92,14 @@ sub getconfig () { #{{{
 
                if (! $config{setup} && ! $config{render}) {
                        loadplugins();
 
                if (! $config{setup} && ! $config{render}) {
                        loadplugins();

-                       usage() unless @ARGV == 2;
-                       $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
-                       $config{destdir} = possibly_foolish_untaint(shift @ARGV);
-                       checkconfig();
+                       if (@ARGV == 2) {
+                               $config{srcdir} = possibly_foolish_untaint(shift @ARGV);
+                               $config{destdir} = possibly_foolish_untaint(shift @ARGV);
+                               checkconfig();
+                       }
+                       else {
+                               usage() unless $config{dumpsetup};
+                       }

                }
        }
        else {
                }
        }
        else {


@@ -101,6 +109,7 @@ sub getconfig () { #{{{
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }
                if ($@) {
                        error("WRAPPED_OPTIONS: $@");
                }

+               delete $ENV{WRAPPED_OPTIONS};

                loadplugins();
                checkconfig();
        }
                loadplugins();
                checkconfig();
        }


@@ -110,8 +119,10 @@ sub main () { #{{{
        getconfig();
        
        if ($config{setup}) {
        getconfig();
        
        if ($config{setup}) {

-               require IkiWiki::Setup;
-               IkiWiki::Setup::load($config{setup});
+               delete $config{setup};
+               loadplugins();
+               checkconfig();
+

                if (@{$config{wrappers}} && 
                    ! $config{render} && ! $config{dumpsetup} &&
                    (! $config{refresh} || $config{genwrappers})) {
                if (@{$config{wrappers}} && 
                    ! $config{render} && ! $config{dumpsetup} &&
                    (! $config{refresh} || $config{genwrappers})) {


@@ -124,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();


@@ -140,13 +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};
-               
-               loadplugins();
-               checkconfig();

        }
 
        if ($config{dumpsetup}) {
        }
 
        if ($config{dumpsetup}) {