From 1c00717cb2737bde3870b2fe504f40bb7d215477 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 26 Jul 2008 15:34:38 -0400
Subject: can now dump fully functional setup files

---
 ikiwiki.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'ikiwiki.in')

diff --git a/ikiwiki.in b/ikiwiki.in
index 70e44541c..8cb8a4769 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,
-- 
cgit v1.2.3