Update img plugin to version 3.20160506

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

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

-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff.

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


@@ -8,6 +6,7 @@ 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]);
 }


@@ -15,11 +14,14 @@ sub import {
 sub gendump ($@) {
        my $class=shift;
 
 sub gendump ($@) {
        my $class=shift;
 

-       "#!/usr/bin/perl",
+       my $thisperl = eval q{use Config; $Config{perlpath}};
+       error($@) if $@;
+
+       "#!$thisperl",

        "#",
        (map { "# $_" } @_),
        "use IkiWiki::Setup::Standard {",
        "#",
        (map { "# $_" } @_),
        "use IkiWiki::Setup::Standard {",

-       IkiWiki::Setup::commented_dump(\&dumpline),
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),

        "}"
 }
 
        "}"
 }