allow --dumpsetup to be used w/o specifying srcdir and destdir

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 8cb8a476939a211a862cc2c185f64d783831dfdb..0390df7e1f64d4755620857aed20b7b8576dae4c 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -88,10 +88,14 @@ sub getconfig () { #{{{
 
                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 {
@@ -150,8 +154,8 @@ sub main () { #{{{
        }
 
        if ($config{dumpsetup}) {
-               require IkiWiki::Setup::Standard;
-               IkiWiki::Setup::Standard::dump($config{dumpsetup});
+               require IkiWiki::Setup;
+               IkiWiki::Setup::dump($config{dumpsetup});
        }
        elsif ($config{wrapper}) {
                lockwiki();