move generic comment into IkiWiki::Setup

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 369ff44d094df5cd5efd5757f9a9059d790f03de..45f263bc8988b990f447c3d7c84947bd4997043e 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -52,7 +52,14 @@ sub dump ($) {
        
        eval qq{require $config{setuptype}};
        error $@ if $@;
        
        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;
 
        open (OUT, ">", $file) || die "$file: $!";
        print OUT "$_\n" foreach @dump;

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9c177e497ae105a4e8646c40425cfc46f8a25644..92e97c4b41fcbaed41b1a4ca2e787da7913f0526 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -12,20 +12,15 @@ sub import {
        IkiWiki::Setup::merge($_[1]);
 }
 
        IkiWiki::Setup::merge($_[1]);
 }
 

-sub gendump ($$) {
+sub gendump ($@) {

        my $class=shift;
        my $class=shift;

-       my $description=shift;

 
        "#!/usr/bin/perl",
 
        "#!/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),
        "use IkiWiki::Setup::Standard {",
        IkiWiki::Setup::commented_dump(\&dumpline),

-       "}";
+       "}"

 }
 
 sub dumpline ($$$$) {
 }
 
 sub dumpline ($$$$) {