pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Replace interpreters in non-installed files



Module Name:	pkgsrc-wip
Committed By:	Edgar Fuß <ef%math.uni-bonn.de@localhost>
Pushed By:	ef
Date:		Mon Jan 18 10:21:22 2021 +0100
Changeset:	42ddd606015563db6966a710795365bb4c3ae00b

Modified Files:
	icingaweb2/Makefile

Log Message:
Replace interpreters in non-installed files

To silence warnings with PKG_DEVELOPER=yes, replace interpreters in three files which are not actually installed:

/usr/bin/env php in test/check-syntax.php
/bin/bash in test/setup_vendor.sh
/bin/bash in test/travis_database.sh

There are no bashisms in the two .sh files.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=42ddd606015563db6966a710795365bb4c3ae00b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 icingaweb2/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diffs:
diff --git a/icingaweb2/Makefile b/icingaweb2/Makefile
index 8b094e8fde..d2e5ccfe86 100644
--- a/icingaweb2/Makefile
+++ b/icingaweb2/Makefile
@@ -116,10 +116,14 @@ NONEXECFILES+=	library/vendor/HTMLPurifier/DefinitionCache/Serializer/README
 # for actual chmod, see post-extract below
 
 
+REPLACE_SH=		test/setup_vendor.sh		# !/usr/bin/bash, no bashisms (not actually installed)
+REPLACE_SH+=		test/travis_database.sh		# !/usr/bin/bash, no bashisms (not actually installed)
+
 REPLACE_INTERPRETER+=	php
-REPLACE.php.old=	/usr/bin/php
+REPLACE.php.old=	.*php				# /usr/bin/php, /usr/bin/env php
 REPLACE.php.new=	${PREFIX}/bin/php
-REPLACE_FILES.php=	packages/files/bin/icingacli
+REPLACE_FILES.php=	packages/files/bin/icingacli	# /usr/bin/php
+REPLACE_FILES.php+=	test/check-syntax.php		# /usr/bin/env php (but not actually installed)
 
 # We need a lot of SUBSTs. The list of hard-coded paths was gathered along the lines of "grep -rF '/etc/' . | sed -n -e 's:^.*/etc/\([^/]*\)/.*$:\1:p' | sort | uniq" etc., plus manual inspection.
 # See below for a descrption what is NOT substituted.


Home | Main Index | Thread Index | Old Index