X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/12c5786df4e74c143f24398b8d0028000b61daba..137624775407e433935f68b9ee282723adca1513:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9d4732b6f..dd613fd03 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -28,12 +28,11 @@ sub dumpline ($$$$) { #{{{
 	local $Data::Dumper::Quotekeys=0;
 	
 	my $dumpedvalue;
-	if ($type eq 'boolean' || $type eq 'integer') {
+	if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
 		# avoid quotes
 		$dumpedvalue=$value;
 	}
-	elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
-	    ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+	elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^-A-Za-z0-9_]/ } @$value) {
 		# dump simple array as qw{}
 		$dumpedvalue="[qw{ ".join(" ", @$value)." }]";
 	}
@@ -89,31 +88,14 @@ sub gendump ($) { #{{{
 	# disable logging to syslog while dumping
 	$config{syslog}=0;
 
-	push @ret, "\t# basic setup";
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
-
-	# 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 $pair (IkiWiki::Setup::getsetup()) {
+		my $plugin=$pair->[0];
+		my $setup=$pair->[1];
+		push @ret, "", "\t# $plugin plugin";
+		push @ret, dumpvalues(\%setup, @{$setup});
 	}
 
-	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,
 		"#!/usr/bin/perl",
 		"# $description",