X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/12c5786df4e74c143f24398b8d0028000b61daba..d1a9e6b6e8ee9fe2fb2d6210653c23f84982b5f0:/ikiwiki.in?ds=inline

diff --git a/ikiwiki.in b/ikiwiki.in
index d8e848f87..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},
@@ -105,6 +109,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		delete $ENV{WRAPPED_OPTIONS};
 		loadplugins();
 		checkconfig();
 	}
@@ -114,9 +119,7 @@ sub main () { #{{{
 	getconfig();
 	
 	if ($config{setup}) {
-		require IkiWiki::Setup;
-		IkiWiki::Setup::load($config{setup});
-		
+		delete $config{setup};
 		loadplugins();
 		checkconfig();
 
@@ -132,7 +135,7 @@ sub main () { #{{{
 			foreach my $wrapper (@wrappers) {
 				%config=(%origconfig,
 					rebuild => 0,
-					verbose => 0,
+					verbose => undef,
 					%{$wrapper},
 				);
 				checkconfig();
@@ -148,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});
 	}