X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ae8318b3cb447f400810c3fe8a8021720b965233..0e0ee9b2ce2e74e5f4241a1c451eda8e9e0365d4:/ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 5dc6ca952..febc8ff56 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -28,7 +28,7 @@ sub getconfig () { #{{{
 			"refresh!" => \$config{refresh},
 			"post-commit" => \$config{post_commit},
 			"render=s" => \$config{render},
-			"wrappers!" => \$config{wrappers},
+			"wrappers!" => \$config{genwrappers},
 			"usedirs!" => \$config{usedirs},
 			"prefix-directives!" => \$config{prefix_directives},
 			"getctime" => \$config{getctime},
@@ -68,7 +68,7 @@ sub getconfig () { #{{{
 				$config{wrappermode}=possibly_foolish_untaint($_[1])
 			},
 			"plugin=s@" => sub {
-				push @{$config{plugin}}, $_[1];
+				push @{$config{add_plugins}}, $_[1];
 			},
 			"disable-plugin=s@" => sub {
 				push @{$config{disable_plugins}}, $_[1];
@@ -112,13 +112,15 @@ sub main () { #{{{
 	if ($config{setup}) {
 		require IkiWiki::Setup;
 		IkiWiki::Setup::load($config{setup});
-		if (! $config{render} && ! $config{dumpsetup} &&
-		    (! $config{refresh} || $config{wrappers})) {
+		if (@{$config{wrappers}} && 
+		    ! $config{render} && ! $config{dumpsetup} &&
+		    (! $config{refresh} || $config{genwrappers})) {
 			debug(gettext("generating wrappers.."));
 			require IkiWiki::Wrapper;
 			my %origconfig=(%config);
 			my @wrappers=@{$config{wrappers}};
 			delete $config{wrappers};
+			delete $config{genwrappers};
 			foreach my $wrapper (@wrappers) {
 				%config=(%origconfig,
 					rebuild => 0,
@@ -141,15 +143,15 @@ sub main () { #{{{
 		
 		# ignore syslog setting from setup file
 		# while doing initial setup
-		$config{syslog}=0;	
+		$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();