[packages/rpm-pld-macros] - version 1.747: support for filenames with spaces in shebang checks
qboosh
qboosh at pld-linux.org
Thu Apr 16 21:33:34 CEST 2020
commit 2d6f794905ff42d4496d3d2b086979f9722e81c2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Apr 16 21:33:39 2020 +0200
- version 1.747: support for filenames with spaces in shebang checks
macros.pld | 6 ++++--
rpm-pld-macros.spec | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index ade5e12..c21a347 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.746
+%define rpm_macros_rev 1.747
%define find_lang_rev 1.40
# split into individual X_prov_ver if there is a reason to desync
%define prov_ver 4.15
diff --git a/macros.pld b/macros.pld
index ffc1494..e029dc2 100644
--- a/macros.pld
+++ b/macros.pld
@@ -807,9 +807,9 @@ __spec_install_post_check_tmpfiles() { \
%__spec_install_post_check_shebangs { \
__spec_install_post_check_shebangs() { \
%{!?debug:set +x;} \
- fail=0; \
echo "Checking script shebangs..."; \
- for f in $(find $RPM_BUILD_ROOT -type f -perm -500 -print); do \
+ fail=` \
+ find $RPM_BUILD_ROOT -type f -perm -500 -print | { fail=0; while IFS= read -r f; do \
shebang="$(sed -e'1s/#! *\(.*\)/\1/;t;d;q' "$f")" ; \
f="${f##$RPM_BUILD_ROOT}"; \
case "$shebang" in \
@@ -828,6 +828,8 @@ __spec_install_post_check_shebangs() { \
*) ;;\
esac ; \
done ; \
+ echo "$fail" ; \
+ }`; \
echo " DONE" ; \
%{!?no_install_post_check_shebangs:return $fail;} \
}; __spec_install_post_check_shebangs }}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/2d6f794905ff42d4496d3d2b086979f9722e81c2
More information about the pld-cvs-commit
mailing list