ensure_committer: don't do anything if we have the environment variables

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 951bcfc56febfce724d82c652f96468c227709d2..ea7d763bbd26435c9dfb9462e1930f4cf7920b7a 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.

 
 package IkiWiki::Setup::Standard;
 
 
 package IkiWiki::Setup::Standard;
 


@@ -9,10 +6,25 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

+# Parameters to import should be all the standard ikiwiki config, in a hash.

 sub import {
        IkiWiki::Setup::merge($_[1]);
 }
 
 sub import {
        IkiWiki::Setup::merge($_[1]);
 }
 

+sub gendump ($@) {
+       my $class=shift;
+
+       my $thisperl = eval q{use Config; $Config{perlpath}};
+       error($@) if $@;
+
+       "#!$thisperl",
+       "#",
+       (map { "# $_" } @_),
+       "use IkiWiki::Setup::Standard {",
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+       "}"
+}
+

 sub dumpline ($$$$) {
        my $key=shift;
        my $value=shift;
 sub dumpline ($$$$) {
        my $key=shift;
        my $value=shift;


@@ -57,61 +69,4 @@ sub dumpline ($$$$) {
        return "\t$prefix$key => $dumpedvalue,";
 }
 
        return "\t$prefix$key => $dumpedvalue,";
 }
 

-sub dumpvalues ($@) {
-       my $setup=shift;
-       my @ret;
-       while (@_) {
-               my $key=shift;
-               my %info=%{shift()};
-
-               next if $key eq "plugin" || $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{example}) {
-                       push @ret, dumpline($key, $info{example}, $info{type}, "#");
-               }
-               else {
-                       push @ret, dumpline($key, "", $info{type}, "#");
-               }
-       }
-       return @ret;
-}
-
-sub gendump ($) {
-       my $description=shift;
-       my %setup=(%config);
-       my @ret;
-       
-       # disable logging to syslog while dumping
-       $config{syslog}=undef;
-
-       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",
-               "# $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;
-}
-

 1
 1