X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/349ff86006b337b7f3cc9d0718c46e68c6f3a41e..9ae54f904af35f0c499180f27cab00d24093e62b:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 25f038a06..b76c87b8e 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,17 +30,22 @@ sub setup_standard {
 		}
 		delete $setup{disable_plugins};
 	}
+	if (exists $setup{exclude}) {
+		$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+	}
 
-	debug("generating wrappers..");
-	my @wrappers=@{$setup{wrappers}};
-	delete $setup{wrappers};
-	my %startconfig=(%config);
-	foreach my $wrapper (@wrappers) {
-		%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-		checkconfig();
-		gen_wrapper();
+	if (! $config{refresh} || $config{wrappers}) {
+		debug("generating wrappers..");
+		my @wrappers=@{$setup{wrappers}};
+		delete $setup{wrappers};
+		my %startconfig=(%config);
+		foreach my $wrapper (@wrappers) {
+			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+			checkconfig();
+			gen_wrapper();
+		}
+		%config=(%startconfig);
 	}
-	%config=(%startconfig);
 	
 	foreach my $c (keys %setup) {
 		if (defined $setup{$c}) {
@@ -64,6 +69,7 @@ sub setup_standard {
 		debug("refreshing wiki..");
 	}
 
+	loadplugins();
 	checkconfig();
 	lockwiki();
 	loadindex();