X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a63929f6cc7778ffc4ba57d784cdf2206ec650c7..092d3cc62e25de2f0c2af7fa47c27abfb8dd1d2f:/IkiWiki/Setup/Standard.pm?ds=inline

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index c99dbb620..07a66f3db 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.
 
 package IkiWiki::Setup::Standard;
 
@@ -9,10 +6,25 @@ use warnings;
 use strict;
 use IkiWiki;
 
+# Parameters to import should be all the standard ikiwiki config, in a hash.
 sub import {
 	IkiWiki::Setup::merge($_[1]);
 }
 
+sub gendump ($@) {
+	my $class=shift;
+
+	my $thisperl = eval q{use Config; $Config{perlpath}};
+	error($@) if $@;
+
+	"#!$thisperl",
+	"#",
+	(map { "# $_" } @_),
+	"use IkiWiki::Setup::Standard {",
+	IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+	"}"
+}
+
 sub dumpline ($$$$) {
 	my $key=shift;
 	my $value=shift;
@@ -21,6 +33,7 @@ sub dumpline ($$$$) {
 	
 	eval q{use Data::Dumper};
 	error($@) if $@;
+	no warnings 'once';
 	local $Data::Dumper::Terse=1;
 	local $Data::Dumper::Indent=1;
 	local $Data::Dumper::Pad="\t";
@@ -28,6 +41,7 @@ sub dumpline ($$$$) {
 	local $Data::Dumper::Quotekeys=0;
 	# only the perl version preserves utf-8 in output
 	local $Data::Dumper::Useperl=1;
+	use warnings;
 	
 	my $dumpedvalue;
 	if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
@@ -57,69 +71,4 @@ sub dumpline ($$$$) {
 	return "\t$prefix$key => $dumpedvalue,";
 }
 
-sub dumpvalues ($@) {
-	my $setup=shift;
-	my @ret;
-	while (@_) {
-		my $key=shift;
-		my %info=%{shift()};
-
-		next if $key eq "plugin" || $info{type} eq "internal";
-		
-		push @ret, "\t# ".$info{description} if exists $info{description};
-		
-		if (exists $setup->{$key} && defined $setup->{$key}) {
-			push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
-			delete $setup->{$key};
-		}
-		elsif (exists $info{example}) {
-			push @ret, dumpline($key, $info{example}, $info{type}, "#");
-		}
-		else {
-			push @ret, dumpline($key, "", $info{type}, "#");
-		}
-	}
-	return @ret;
-}
-
-sub gendump ($) {
-	my $description=shift;
-	my %setup=(%config);
-	my @ret;
-	
-	# disable logging to syslog while dumping
-	$config{syslog}=undef;
-
-	my $curr_section;
-	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
-	foreach my $pair (IkiWiki::Setup::getsetup()) {
-		my $plugin=$pair->[0];
-		my $setup=$pair->[1];
-		my %s=@{$setup};
-		my $section=$s{plugin}->{section};
-		if (! defined $curr_section || $curr_section ne $section) {
-			$curr_section=$section;
-			push @ret, "", "\t#", "\t# $section plugins", "\t#";
-		}
-
-		my @values=dumpvalues(\%setup, @{$setup});
-		if (@values) {
-			push @ret, "", "\t# $plugin plugin", @values;
-		}
-	}
-
-	unshift @ret,
-		"#!/usr/bin/perl",
-		"# $description",
-		"#",
-		"# Passing this to ikiwiki --setup will make ikiwiki generate",
-		"# wrappers and build the wiki.",
-		"#",
-		"# Remember to re-run ikiwiki --setup any time you edit this file.",
-		"use IkiWiki::Setup::Standard {";
-	push @ret, "}";
-
-	return @ret;
-}
-
 1