diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-05-22 13:45:38 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-05-22 13:46:07 -0400 |
commit | 7825960d310977d1ae6fd9ab31d76b611c0f91e8 (patch) | |
tree | 30a601bec7e94e842b74a08248138878ce44e46d | |
parent | 6e6e37b4fc682a7df79d383cb01437738831cd1b (diff) | |
download | ikiwiki-7825960d310977d1ae6fd9ab31d76b611c0f91e8.tar ikiwiki-7825960d310977d1ae6fd9ab31d76b611c0f91e8.tar.gz |
remove -T from ikiwiki.in, add back if NOTAINT=0
-rwxr-xr-x | ikiwiki.in | 2 | ||||
-rwxr-xr-x | 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}}; @@ -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"; |