Removed suffix of "-rate" and let user decide label via --label

[nagiosplug.git] / plugins-scripts / subst.in

diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in
index 9140157bb74d7db5ced2195abdbcd8473231aefe..a70ad8842f17d99353fecc3c1f35e59c4302626d 100644 (file)
--- a/plugins-scripts/subst.in
+++ b/plugins-scripts/subst.in
@@ -29,7 +29,7 @@ function led() {
                return "\"" led3 "/libexec\" " ;
        
        }
-       return led1;
+       return "\"" led1 "\"" ;
 }
 
 BEGIN {
@@ -37,6 +37,9 @@ BEGIN {
 
 }
 
+# Plugin revision
+/@NP_VERSION@/ {sub(/@NP_VERSION@/,ENVIRON["NP_VERSION"]);}
+
 # scripting language (first line)
 
 /^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
@@ -44,28 +47,29 @@ BEGIN {
 /^#! ?\/.*\/[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
+# FIXME: Prepend executables with a substitution keyword instead.
+#
+/^[^#]/ && /(\/.*)?\/(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() )} } }
+/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
 
 
 # Trusted path mechanism (deprecated)
 
 /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
-       sub(/\=[ \t]*['"][^"']+["']/,"='@trusted_path@' # autoconf-derived");
+       sub(/\=[ \t]*['"][^"']+["']/,"='@with_trusted_path@' # autoconf-derived");
 }
 
 /^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ {
-       sub(/\=.*$/,"='@trusted_path@' # autoconf-derived");
-}
-
-# Specific programs
-
-#
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-       match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-       start=RSTART+RLENGTH;
-       c=substr($0,RSTART,RLENGTH);
-       sub(c,which(c,path));
+       sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived");
 }
 
 {