refactor

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index adb8abb6280199527667d03ad1ede171f74a3824..262d494797639a43f62b9a5c89c34f34fec03b04 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -66,9 +66,10 @@ sub dump ($) { #{{{
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;
+       my @dump=IkiWiki::Setup::Standard::gendump("Setup file for ikiwiki.");
 
        open (OUT, ">", $file) || die "$file: $!";
-       print OUT "$_\n" foreach IkiWiki::Setup::Standard::gendump();
+       print OUT "$_\n" foreach @dump;
        close OUT;
 }
 

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 22bfc38a40440df88915375e2d02dd307aebe0e1..54819ae75d822b85f86d7ecdb0b0c30a28094855 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -71,7 +71,8 @@ sub dumpvalues ($@) { #{{{
        return @ret;
 } #}}}
 
-sub gendump () { #{{{
+sub gendump ($) { #{{{
+       my $description=shift;
        my %setup=(%config);
        my @ret;
        
@@ -88,14 +89,15 @@ sub gendump () { #{{{
                push @ret, "";
        }
        
-       unshift @ret, "#!/usr/bin/perl
-# 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.
-
-use IkiWiki::Setup::Standard {";
+       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;