--- nagios-plugins-1.4.13/plugins-scripts/subst.in.orig 2009-04-02 11:42:29.000000000 +1100 +++ nagios-plugins-1.4.13/plugins-scripts/subst.in 2009-04-02 11:43:39.000000000 +1100 @@ -44,6 +44,16 @@ /^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");} /^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");} +# If a script contains a reference to a fully qualified command, +# subst will replace the fully qualified command with whatever is +# returned from the which subroutine. run before changes to INC to add libexecdir +# +/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { + match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); + c=substr($0,RSTART,RLENGTH); + sub(c,which(c,path)); +} + # add to libexecdir to INC for perl utils.pm /^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } } @@ -58,16 +68,6 @@ sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived"); } -# If a script contains a reference to a fully qualified command, -# subst will replace the fully qualified command with whatever is -# returned from the which subroutine -# -/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { - match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); - c=substr($0,RSTART,RLENGTH); - sub(c,which(c,path)); -} - { print; }