From 7825960d310977d1ae6fd9ab31d76b611c0f91e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 May 2009 13:45:38 -0400 Subject: remove -T from ikiwiki.in, add back if NOTAINT=0 --- ikiwiki.in | 2 +- pm_filter | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ikiwiki.in b/ikiwiki.in index c79a2bfef..4e9b812f8 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl $ENV{PATH}="/usr/local/bin:/usr/bin:/bin"; delete @ENV{qw{IFS CDPATH ENV BASH_ENV}}; diff --git a/pm_filter b/pm_filter index 4984f32d9..1e51f9dd3 100755 --- a/pm_filter +++ b/pm_filter @@ -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"; -- cgit v1.2.3