X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3d82d47e1896b8e64c1e22b09a05968fc481aebf..f1e29d04a603351bd92780d1349d848b0eceba05:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index febc8ff56..878d35065 100755
--- 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},
@@ -88,10 +92,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 {
@@ -101,6 +109,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		delete $ENV{WRAPPED_OPTIONS};
 		loadplugins();
 		checkconfig();
 	}
@@ -110,8 +119,10 @@ sub main () { #{{{
 	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})) {
@@ -124,7 +135,7 @@ sub main () { #{{{
 			foreach my $wrapper (@wrappers) {
 				%config=(%origconfig,
 					rebuild => 0,
-					verbose => 0,
+					verbose => undef,
 					%{$wrapper},
 				);
 				checkconfig();
@@ -140,16 +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};
-		
-		loadplugins();
-		checkconfig();
 	}
 
 	if ($config{dumpsetup}) {
+		$config{srdir}=$config{destdir}="";
 		require IkiWiki::Setup;
 		IkiWiki::Setup::dump($config{dumpsetup});
 	}