Fix awk subst.in/subst script path error (#2722832 - Martin Foster)

1 files changed, 11 insertions, 10 deletions

diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in
index 80b93d9d..a70ad884 100644
--- a/plugins-scripts/subst.in
+++ b/plugins-scripts/subst.in
@@ -47,6 +47,17 @@ 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() )} } }
 
@@ -61,16 +72,6 @@ BEGIN {
         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;
 }