- all plugins R: nagios-common (via secondary deps it's wrong)

[packages/nagios-plugins.git] / nagios-plugins-subst.patch

do the utils.pm substitution AFTER path based substitution
otherwise if 'nagios' is in $PATH somewhy, then wrong perl library path is
substituted to perl programs

glen, 2004-12-08

--- ./plugins-scripts/subst.in~	2003-07-02 18:01:22.000000000 +0300
+++ ./plugins-scripts/subst.in	2005-04-02 00:11:24.000000000 +0300
@@ -44,10 +44,6 @@
 /^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");}
 /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");}
 
-# add to libexecdir to INC for perl utils.pm
-/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
-
-
 # Trusted path mechanism (deprecated)
 
 /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
@@ -68,6 +64,9 @@
 	sub(c,which(c,path));
 }
 
+# add to libexecdir to INC for perl utils.pm
+/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
+
 {
 	print;
 }