From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 19:35:21 +0000 (-0400)
Subject: move generic comment into IkiWiki::Setup
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/bbe1f2e493f009b49aba6ab83304f9484e37c61d

move generic comment into IkiWiki::Setup
---

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 369ff44d0..45f263bc8 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -52,7 +52,14 @@ sub dump ($) {
 	
 	eval qq{require $config{setuptype}};
 	error $@ if $@;
-	my @dump=$config{setuptype}->gendump("Setup file for ikiwiki.");
+	my @dump=$config{setuptype}->gendump(
+		"Setup file for ikiwiki.",
+		"",
+		"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.",
+	);
 
 	open (OUT, ">", $file) || die "$file: $!";
 	print OUT "$_\n" foreach @dump;
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9c177e497..92e97c4b4 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -12,20 +12,15 @@ sub import {
 	IkiWiki::Setup::merge($_[1]);
 }
 
-sub gendump ($$) {
+sub gendump ($@) {
 	my $class=shift;
-	my $description=shift;
 
 	"#!/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.",
+	(map { "# $_" } @_),
 	"use IkiWiki::Setup::Standard {",
 	IkiWiki::Setup::commented_dump(\&dumpline),
-	"}";
+	"}"
 }
 
 sub dumpline ($$$$) {