Merge branch 'master' into autoconfig

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d88dc9e1c266aada900195c0e9c33d0db5fd5fd5..54819ae75d822b85f86d7ecdb0b0c30a28094855 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -29,15 +29,21 @@ sub dumpline ($$$$) { #{{{
        
        my $dumpedvalue;
        if ($type eq 'boolean' || $type eq 'integer') {
+               # avoid quotes
                $dumpedvalue=$value;
        }
+       elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
+           ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+       }
        else {
                $dumpedvalue=Dumper($value);
                chomp $dumpedvalue;
                $dumpedvalue=~s/^\t//;
        }
        
-       return "\t$prefix$key=$dumpedvalue,";
+       return "\t$prefix$key => $dumpedvalue,";
 } #}}}
 
 sub dumpvalues ($@) { #{{{
@@ -65,9 +71,8 @@ sub dumpvalues ($@) { #{{{
        return @ret;
 } #}}}
 
-sub dump ($) { #{{{
-       my $file=IkiWiki::possibly_foolish_untaint(shift);
-       
+sub gendump ($) { #{{{
+       my $description=shift;
        my %setup=(%config);
        my @ret;
        
@@ -84,19 +89,18 @@ sub dump ($) { #{{{
                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, "}";
 
-       open (OUT, ">", $file) || die "$file: $!";
-       print OUT "$_\n" foreach @ret;
-       close OUT;
+       return @ret;
 } #}}}
 
 1