remove -T from ikiwiki.in, add back if NOTAINT=0

diff --git a/ikiwiki.in b/ikiwiki.in
index c79a2bfef98dd8ee6a3042bfdde919f3304534b0..4e9b812f852cb4b9805c51d7af6c0d0576d8a976 100755 (executable)
--- 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 4984f32d906eae416001dad7f29baab986c0d8c2..1e51f9dd347c79e738d4aa9b4ef33da86aeafbfa 100755 (executable)
--- 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";