X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=pm_filter;h=1e51f9dd347c79e738d4aa9b4ef33da86aeafbfa;hp=71f26fae8cfad62002bd304700460a02ac27c6df;hb=f20230eed5033cf4e06f23a51b92bf758f477955;hpb=e6992480e2e0cf965650f84aa97e01fe0fa71544 diff --git a/pm_filter b/pm_filter index 71f26fae8..1e51f9dd3 100755 --- a/pm_filter +++ b/pm_filter @@ -14,7 +14,7 @@ elsif (/VERSION_AUTOREPLACE/) { } elsif (/^use lib/) { # The idea here is to figure out if the libdir the Makefile.PL - # was configure to use is in perl's normal search path. + # was configured to use is in perl's normal search path. # If not, hard code it into ikiwiki. if ((grep { $_ eq $libdir } @INC) && (! exists $ENV{PERL5LIB} || ! length $ENV{PERL5LIB} || @@ -25,8 +25,8 @@ elsif (/^use lib/) { $_="use lib '$libdir';\n"; } } -elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) { - $_=qq{$1\n}; +elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) { + $_=qq{$1 -T\n}; } elsif (/^\$ENV{PATH}="(.*)";/) { $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";