Revert spam

[git.ikiwiki.info.git] / pm_filter

diff --git a/pm_filter b/pm_filter
index 71f26fae8cfad62002bd304700460a02ac27c6df..7b03418ab241de1c93f5d02da8b25b1eccb5219c 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -7,14 +7,14 @@ BEGIN {
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
-       $_=qq{our \$installdir="$prefix";};
+       $_=qq{our \$installdir="\Q$prefix\E";};
 }
 elsif (/VERSION_AUTOREPLACE/) {
-       $_=qq{our \$version="$ver";};
+       $_=qq{our \$version="\Q$ver\E";};
 }
-elsif (/^use lib/) {
+elsif (/^(?:use FindBin; *)?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} ||
@@ -22,12 +22,12 @@ elsif (/^use lib/) {
                $_="";
        }
        else {
-               $_="use lib '$libdir';\n";
+               $_="use lib \"\Q$libdir\E\";\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";
+elsif (/^\$ENV\{PATH}="(.*)";/) {
+       $_="\$ENV{PATH}=\"\Q$1\E:\Q$prefix\E/bin\";\n";
 }