X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/1c00717cb2737bde3870b2fe504f40bb7d215477..b7d6a49be4a5e1d9c94219392179c14dba40034a:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 8cb8a4769..d8e848f87 100755
--- 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 {
@@ -112,6 +116,10 @@ sub main () { #{{{
 	if ($config{setup}) {
 		require IkiWiki::Setup;
 		IkiWiki::Setup::load($config{setup});
+		
+		loadplugins();
+		checkconfig();
+
 		if (@{$config{wrappers}} && 
 		    ! $config{render} && ! $config{dumpsetup} &&
 		    (! $config{refresh} || $config{genwrappers})) {
@@ -144,14 +152,11 @@ sub main () { #{{{
 		# ignore syslog setting from setup file
 		# while doing initial setup
 		$config{syslog}=0 unless $config{dumpsetup};
-		
-		loadplugins();
-		checkconfig();
 	}
 
 	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();