Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9c177e497ae105a4e8646c40425cfc46f8a25644..c8506930475a0c28ead9e613e7cde64d982b6db9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,6 +1,4 @@
 #!/usr/bin/perl
-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff.
 
 package IkiWiki::Setup::Standard;
 
@@ -8,24 +6,20 @@ 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 ($$) {
+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),
-       "}";
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+       "}"
 }
 
 sub dumpline ($$$$) {