diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-12 00:37:44 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-12 00:37:44 +0000 |
| commit | b7ceab86aace099e0cccb8547253e9c1e1089df1 (patch) | |
| tree | 9884c8fd5819ee39e6a020c24f61cec6f81ba144 /mk/check | |
| parent | 5644aacf253701c2a00960bf6f9b7758f456896a (diff) | |
| download | pkgsrc-b7ceab86aace099e0cccb8547253e9c1e1089df1.tar.gz | |
Improved the formatting of the comment and made the code a little
shorter.
Diffstat (limited to 'mk/check')
| -rw-r--r-- | mk/check/check-interpreter.mk | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/mk/check/check-interpreter.mk b/mk/check/check-interpreter.mk index 9516b9a50b7..965a61b4eb5 100644 --- a/mk/check/check-interpreter.mk +++ b/mk/check/check-interpreter.mk @@ -1,23 +1,26 @@ -# $NetBSD: check-interpreter.mk,v 1.14 2006/10/10 13:01:26 joerg Exp $ - +# $NetBSD: check-interpreter.mk,v 1.15 2006/11/12 00:37:44 rillig Exp $ +# # This file checks that after installation, all files of the package # that start with a "#!" line will find their interpreter. Files that # have a "#!" line with a non-existent interpreter will generate an # error message if they are executable, and a warning message otherwise. # -# The following variables may be set by the pkgsrc user in mk.conf: +# User-settable variables: # -# CHECK_INTERPRETER: YesNo (default: no) +# CHECK_INTERPRETER # Whether this check should be enabled or not. # -# The following variables may be set by a package: +# Default value: "no" +# +# Package-settable variables: +# +# CHECK_INTERPRETER_SKIP +# The list of file patterns that are skipped by the check. +# All files in share/examples and share/doc are skipped as well. # -# CHECK_INTERPRETER_SKIP: List of paths or paths with wildcards -# (default: empty) -# (example: share/package1/* share/package2/somefile) -# The list of files that are skipped when running the check. -# Additionally, all files in share/examples and share/doc are -# skipped as well. +# Default value: (empty) +# +# Example: share/package1/* share/package2/somefile # CHECK_INTERPRETER?= no @@ -27,11 +30,6 @@ _CHECK_INTERP_SKIP= share/doc/* _CHECK_INTERP_SKIP+= share/examples/* _CHECK_INTERP_SKIP+= ${CHECK_INTERPRETER_SKIP} -_CHECK_INTERP_SKIP_FILTER= case $$file in -_CHECK_INTERP_SKIP_FILTER+= ${_CHECK_INTERP_SKIP:@.pattern.@${PREFIX}/${.pattern.}|${.pattern.}) continue ;;@} -_CHECK_INTERP_SKIP_FILTER+= *) ;; -_CHECK_INTERP_SKIP_FILTER+= esac - _CHECK_INTERP_FILELIST_CMD?= ${SED} -e '/^@/d' ${PLIST} ###################################################################### @@ -50,8 +48,11 @@ check-interpreter: error-check cd ${PREFIX}; \ ${_CHECK_INTERP_FILELIST_CMD} | ${SORT} | ${SED} 's,\\,\\\\,g' |\ while read file; do \ - ${_CHECK_INTERP_SKIP_FILTER}; \ - if ${TEST} ! -r "$$file"; then \ + case "$$file" in \ + ${_CHECK_INTERP_SKIP:@p@${PREFIX}/${p}|${p}) continue ;;@} \ + *) ;; \ + esac; \ + if [ ! -r "$$file" ]; then \ ${DELAYED_WARNING_MSG} "[check-interpreter.mk] File \"$$file\" cannot be read."; \ continue; \ fi; \ @@ -60,11 +61,11 @@ check-interpreter: error-check || { ${DELAYED_WARNING_MSG} "[check-interpreter.mk] sed(1) failed for \"$$file\"."; \ continue; \ }; \ - case $$interp in \ + case "$$interp" in \ "") continue; \ esac; \ - if ${TEST} ! -f "$$interp"; then \ - if ${TEST} -x "$$file"; then \ + if [ ! -f "$$interp" ]; then \ + if [ -x "$$file" ]; then \ ${DELAYED_ERROR_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"$$file\" does not exist."; \ else \ ${DELAYED_WARNING_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"$$file\" does not exist."; \ |