From c08d6a429ba0e0cd3642ba2c2fe85687472ee22f Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Fri, 28 Feb 2014 13:28:33 +0100 Subject: Replace "plugins-scripts/subst.in" foo Remove the buggy and complex awk(1) magic in "plugins-scripts/subst.in" in favor of simple sed(1) substitutions. The plugins in the "plugins-scripts" directory now always use the PATH specified via "./configure --trusted-path", or the default PATH hard-coded in "configure.ac". Fixes #1242. --- plugins-scripts/subst.in | 53 ------------------------------------------------ 1 file changed, 53 deletions(-) delete mode 100644 plugins-scripts/subst.in (limited to 'plugins-scripts/subst.in') diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in deleted file mode 100644 index c730b770..00000000 --- a/plugins-scripts/subst.in +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/awk - -function which(c,path) { - cmd = "test -x " c; - - if (system(cmd)==0) { - return c; - } - - sub(/\/.*\//,"",c); - for (dir in path) { - cmd = "test -x " path[dir] "/" c; - if (system(cmd)==0) { - return path[dir] "/" c; - } - } - - - return c; -} - -BEGIN { - split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/); - -} - -# Plugin revision -/@NP_VERSION@/ {sub(/@NP_VERSION@/,ENVIRON["NP_VERSION"]);} - -# scripting language (first line) - -/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");} -/^#! ?\/.*\/perl/ {sub(/^#! ?\/.*\/perl/,"#! @PERL@");} -/^#! ?\/.*\/[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)); -} - -# Trusted path mechanism -/@trusted_path@/ {sub(/@trusted_path@/,"@with_trusted_path@");} - -{ - print; -} -- cgit v1.2.3-74-g34f1