Deal with different paths to perl when removing -T flag.

master
Joey Hess 2008-04-28 15:37:17 -04:00
parent 4723d5f9f1
commit dbb5d11196
3 changed files with 4 additions and 1 deletions

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ ikiwiki (2.45) UNRELEASED; urgency=low
time. This allows the toc to be displayed when previewing an edit. It also
avoids headers in the page template from showing up in the toc.
* Add PREFIX/bin to the hardcoded PATH within ikiwiki.
* Deal with different paths to perl when removing -T flag.
-- Joey Hess <joeyh@debian.org> Sat, 26 Apr 2008 15:09:36 -0400

View File

@ -26,3 +26,5 @@ line 1.
>> over-broad. --[[Joey]]
>>> Yes, being more precise should be fine. Note that some may have bin/perl5 or bin/perl5.8.8 for example, so please consider optional number, like ^(#!/.*/perl[0-9]*.*) -T$ or something like that.
[[done]]

View File

@ -20,7 +20,7 @@ elsif (/^use lib/) {
$_="use lib '$libdir';\n";
}
}
elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) {
elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) {
$_=qq{$1\n};
}
if (/^\$ENV{PATH}="(.*)";/) {