X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4ef96e2d9994c407f0f2f46301eb91fab6b48a37..1d5ba6cf51275ddcb26312b440b8680f8a52c2b2:/ikiwiki.in?ds=sidebyside

diff --git a/ikiwiki.in b/ikiwiki.in
index 0390df7e1..ddbd71056 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -105,6 +105,7 @@ sub getconfig () { #{{{
 		if ($@) {
 			error("WRAPPED_OPTIONS: $@");
 		}
+		delete $ENV{WRAPPED_OPTIONS};
 		loadplugins();
 		checkconfig();
 	}
@@ -116,6 +117,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})) {
@@ -128,7 +133,7 @@ sub main () { #{{{
 			foreach my $wrapper (@wrappers) {
 				%config=(%origconfig,
 					rebuild => 0,
-					verbose => 0,
+					verbose => undef,
 					%{$wrapper},
 				);
 				checkconfig();
@@ -148,9 +153,6 @@ sub main () { #{{{
 		# ignore syslog setting from setup file
 		# while doing initial setup
 		$config{syslog}=0 unless $config{dumpsetup};
-		
-		loadplugins();
-		checkconfig();
 	}
 
 	if ($config{dumpsetup}) {