X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fe6b271501d4d8ae00a012d14a8814cee5e0e55d..dccdff53ae9437ce728ac1f3b081591423a7a7fd:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a..7512c2587 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -19,17 +19,34 @@ package IkiWiki;
 sub setup_standard {
 	my %setup=%{$_[1]};
 
-	if (! $config{refresh}) {
+	$setup{plugin}=$config{plugin};
+	if (exists $setup{add_plugins}) {
+		push @{$setup{plugin}}, @{$setup{add_plugins}};
+		delete $setup{add_plugins};
+	}
+	if (exists $setup{disable_plugins}) {
+		foreach my $plugin (@{$setup{disable_plugins}}) {
+			$setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
+		}
+		delete $setup{disable_plugins};
+	}
+	if (exists $setup{exclude}) {
+		$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+	}
+
+	if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
 		debug("generating wrappers..");
+		my @wrappers=@{$setup{wrappers}};
+		delete $setup{wrappers};
 		my %startconfig=(%config);
-		foreach my $wrapper (@{$setup{wrappers}}) {
+		foreach my $wrapper (@wrappers) {
 			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
 			checkconfig();
 			gen_wrapper();
 		}
 		%config=(%startconfig);
-		delete $config{wrappers};
 	}
+	
 	foreach my $c (keys %setup) {
 		if (defined $setup{$c}) {
 			if (! ref $setup{$c}) {
@@ -38,13 +55,21 @@ sub setup_standard {
 			elsif (ref $setup{$c} eq 'ARRAY') {
 				$config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
 			}
+			elsif (ref $setup{$c} eq 'HASH') {
+				foreach my $key (keys %{$setup{$c}}) {
+					$config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+				}
+			}
 		}
 		else {
 			$config{$c}=undef;
 		}
 	}
 
-	if (! $config{refresh}) {
+	if ($config{render}) {
+		commandline_render();
+	}
+	elsif (! $config{refresh}) {
 		$config{rebuild}=1;
 		debug("rebuilding wiki..");
 	}
@@ -52,6 +77,7 @@ sub setup_standard {
 		debug("refreshing wiki..");
 	}
 
+	loadplugins();
 	checkconfig();
 	lockwiki();
 	loadindex();