adminemail may be undefined

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 8b0bc22799dab625b9d5f8c411f8d34a93add084..d88dc9e1c266aada900195c0e9c33d0db5fd5fd5 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -7,14 +7,18 @@ package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
+use IkiWiki;
 
 sub import { #{{{
        $IkiWiki::Setup::raw_setup=$_[1];
 } #}}}
 
-sub generate (@) { #{{{
-       my %setup=@_;
-
+sub dumpline ($$$$) { #{{{
+       my $key=shift;
+       my $value=shift;
+       my $type=shift;
+       my $prefix=shift;
+       
        eval q{use Data::Dumper};
        error($@) if $@;
        local $Data::Dumper::Terse=1;
@@ -22,49 +26,77 @@ sub generate (@) { #{{{
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
+       
+       my $dumpedvalue;
+       if ($type eq 'boolean' || $type eq 'integer') {
+               $dumpedvalue=$value;
+       }
+       else {
+               $dumpedvalue=Dumper($value);
+               chomp $dumpedvalue;
+               $dumpedvalue=~s/^\t//;
+       }
+       
+       return "\t$prefix$key=$dumpedvalue,";
+} #}}}
 
-       my @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.
+sub dumpvalues ($@) { #{{{
+       my $setup=shift;
+       my @ret;
+       while (@_) {
+               my $key=shift;
+               my %info=%{shift()};
 
-use IkiWiki::Setup::Standard {";
+               next if $info{type} eq "internal";
+               
+               push @ret, "\t# ".$info{description} if exists $info{description};
+               
+               if (exists $setup->{$key} && defined $setup->{$key}) {
+                       push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
+                       delete $setup->{$key};
+               }
+               elsif (exists $info{default} && defined $info{default}) {
+                       push @ret, dumpline($key, $info{default}, $info{type}, "#");
+               }
+               elsif (exists $info{example}) {
+                       push @ret, dumpline($key, $info{example}, $info{type}, "#");
+               }
+       }
+       return @ret;
+} #}}}
 
-       foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
-               my @setup=$IkiWiki::hooks{getsetup}{$id}{call}->();
-               return unless @setup;
-               push @ret, "\t# $id plugin";
-               while (@setup) {
-                       my $key=shift @setup;
-                       my %info=%{shift @setup};
+sub dump ($) { #{{{
+       my $file=IkiWiki::possibly_foolish_untaint(shift);
        
-                       push @ret, "\t# ".$info{description} if exists $info{description};
+       my %setup=(%config);
+       my @ret;
        
-                       my $value=undef;
-                       my $prefix="#";
-                       if (exists $setup{$key} && defined $setup{$key}) {
-                               $value=$setup{$key};
-                               $prefix="";
-                       }
-                       elsif (exists $info{default}) {
-                               $value=$info{default};
-                       }
-                       elsif (exists $info{example}) {
-                               $value=$info{example};
-                       }
-       
-                       my $dumpedvalue=Dumper($value);
-                       chomp $dumpedvalue;
-                       $dumpedvalue=~/^\t//;
-                       push @ret, "\t$prefix$key=$dumpedvalue,";
-               }
+       push @ret, "\t# basic setup";
+       push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+       push @ret, "";
+
+       foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
+               # use an array rather than a hash, to preserve order
+               my @s=$IkiWiki::hooks{getsetup}{$id}{call}->();
+               return unless @s;
+               push @ret, "\t# $id plugin";
+               push @ret, dumpvalues(\%setup, @s);
                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 {";
        push @ret, "}";
-       return @ret;
+
+       open (OUT, ">", $file) || die "$file: $!";
+       print OUT "$_\n" foreach @ret;
+       close OUT;
 } #}}}
 
 1