use IkiWiki;
sub import { #{{{
- $IkiWiki::Setup::raw_setup=$_[1];
+ IkiWiki::Setup::merge($_[1]);
} #}}}
sub dumpline ($$$$) { #{{{
local $Data::Dumper::Quotekeys=0;
my $dumpedvalue;
- if ($type eq 'boolean' || $type eq 'integer') {
+ if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
+ # avoid quotes
$dumpedvalue=$value;
}
+ elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
+ # dump simple array as qw{}
+ $dumpedvalue="[qw{".join(" ", @$value)."}]";
+ }
else {
$dumpedvalue=Dumper($value);
chomp $dumpedvalue;
+ if (length $prefix) {
+ # add to second and subsequent lines
+ my @lines=split(/\n/, $dumpedvalue);
+ $dumpedvalue="";
+ for (my $x=0; $x <= $#lines; $x++) {
+ $lines[$x] =~ s/^\t//;
+ $dumpedvalue.="\t".($x ? $prefix : "").$lines[$x]."\n";
+ }
+ }
$dumpedvalue=~s/^\t//;
+ chomp $dumpedvalue;
}
- return "\t$prefix$key=$dumpedvalue,";
+ return "\t$prefix$key => $dumpedvalue,";
} #}}}
sub dumpvalues ($@) { #{{{
my $key=shift;
my %info=%{shift()};
- next if $info{type} eq "internal";
+ next if $key eq "plugin" || $info{type} eq "internal";
push @ret, "\t# ".$info{description} if exists $info{description};
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}, "#");
}
+ else {
+ push @ret, dumpline($key, "", $info{type}, "#");
+ }
}
return @ret;
} #}}}
-sub dump ($) { #{{{
- my $file=IkiWiki::possibly_foolish_untaint(shift);
-
+sub gendump ($) { #{{{
+ my $description=shift;
my %setup=(%config);
my @ret;
- push @ret, "\t# basic setup";
- push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
- push @ret, "";
+ # disable logging to syslog while dumping
+ $config{syslog}=undef;
- 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, "";
+ push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+ foreach my $pair (IkiWiki::Setup::getsetup()) {
+ my $plugin=$pair->[0];
+ my $setup=$pair->[1];
+ my @values=dumpvalues(\%setup, @{$setup});
+ if (@values) {
+ push @ret, "", "\t# $plugin plugin", @values;
+ }
}
-
- 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