X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cab1ac75c91d8c351c41920a02e79484a34428e2..f41448d9caf591ba369bf319297d15552be94678:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 54819ae75..9d4732b6f 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -10,7 +10,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-	$IkiWiki::Setup::raw_setup=$_[1];
+	IkiWiki::Setup::merge($_[1]);
 } #}}}
 
 sub dumpline ($$$$) { #{{{
@@ -40,7 +40,17 @@ sub dumpline ($$$$) { #{{{
 	else {
 		$dumpedvalue=Dumper($value);
 		chomp $dumpedvalue;
+		if (length $prefix) {
+			# add to second and subsequent lines
+			my @lines=split(/\n/, $dumpedvalue);
+			$dumpedvalue="";
+			for (my $x=0; $x <= $#lines; $x++) {
+				$lines[$x] =~ s/^\t//;
+				$dumpedvalue.="\t".($x ? $prefix : "").$lines[$x]."\n";
+			}
+		}
 		$dumpedvalue=~s/^\t//;
+		chomp $dumpedvalue;
 	}
 	
 	return "\t$prefix$key => $dumpedvalue,";
@@ -61,12 +71,12 @@ sub dumpvalues ($@) { #{{{
 			push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
 			delete $setup->{$key};
 		}
-		elsif (exists $info{default} && defined $info{default}) {
-			push @ret, dumpline($key, $info{default}, $info{type}, "#");
-		}
 		elsif (exists $info{example}) {
 			push @ret, dumpline($key, $info{example}, $info{type}, "#");
 		}
+		else {
+			push @ret, dumpline($key, "", $info{type}, "#");
+		}
 	}
 	return @ret;
 } #}}}
@@ -76,17 +86,32 @@ sub gendump ($) { #{{{
 	my %setup=(%config);
 	my @ret;
 	
+	# disable logging to syslog while dumping
+	$config{syslog}=0;
+
 	push @ret, "\t# basic setup";
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
-	push @ret, "";
 
-	foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
-		# use an array rather than a hash, to preserve order
-		my @s=$IkiWiki::hooks{getsetup}{$id}{call}->();
-		return unless @s;
-		push @ret, "\t# $id plugin";
-		push @ret, dumpvalues(\%setup, @s);
-		push @ret, "";
+	# Load all plugins, so that all setup options are available.
+	# (But skip a few problematic external demo plugins.)
+	my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
+		sort(IkiWiki::listplugins());
+	unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
+	foreach my $plugin (@plugins) {
+		eval { IkiWiki::loadplugin($plugin) };
+		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
+			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
+		}
+	}
+
+	foreach my $id (@plugins) {
+		if (exists $IkiWiki::hooks{getsetup}{$id}{call}) {
+			# use an array rather than a hash, to preserve order
+			my @s=eval { $IkiWiki::hooks{getsetup}{$id}{call}->() };
+			next unless @s;
+			push @ret, "", "\t# $id plugin";
+			push @ret, dumpvalues(\%setup, @s);
+		}
 	}
 	
 	unshift @ret,