Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 33b578e12c0a2672c864b7ac4ccfbe2e33c2ad4e..07a66f3db279eabf6907c842e986b4c35095d3d5 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -14,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"),

        "}"
 }
 
        "}"
 }
 


@@ -30,6 +33,7 @@ sub dumpline ($$$$) {
        
        eval q{use Data::Dumper};
        error($@) if $@;
        
        eval q{use Data::Dumper};
        error($@) if $@;

+       no warnings 'once';

        local $Data::Dumper::Terse=1;
        local $Data::Dumper::Indent=1;
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Terse=1;
        local $Data::Dumper::Indent=1;
        local $Data::Dumper::Pad="\t";


@@ -37,6 +41,7 @@ sub dumpline ($$$$) {
        local $Data::Dumper::Quotekeys=0;
        # only the perl version preserves utf-8 in output
        local $Data::Dumper::Useperl=1;
        local $Data::Dumper::Quotekeys=0;
        # only the perl version preserves utf-8 in output
        local $Data::Dumper::Useperl=1;

+       use warnings;

        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {