diff options
| author | jlam <jlam@pkgsrc.org> | 2017-08-19 00:30:55 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-08-19 00:30:55 +0000 |
| commit | 62cbc2bdc9d548c117efb728c3b285e79a96674c (patch) | |
| tree | db493a7906b81875314a9ef26b53da08db023a3d /mk | |
| parent | 15285ad9a4463e47291f2812639b35f8b2f00169 (diff) | |
| download | pkgsrc-62cbc2bdc9d548c117efb728c3b285e79a96674c.tar.gz | |
mk/pkgtasks: Fix postinstall check to not skip last set of files.
The postinstall check was improperly skipping the last N items
listed in CONF_FILES (and related) variables when verifying that
there is a multiple of N items listed. Fix the bounds check.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkgtasks/files.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/pkgtasks/files.mk b/mk/pkgtasks/files.mk index 2959388c923..081f61895ab 100644 --- a/mk/pkgtasks/files.mk +++ b/mk/pkgtasks/files.mk @@ -1,4 +1,4 @@ -# $NetBSD: files.mk,v 1.8 2017/08/19 00:30:42 jlam Exp $ +# $NetBSD: files.mk,v 1.9 2017/08/19 00:30:55 jlam Exp $ # # Copyright (c) 2017 The NetBSD Foundation, Inc. # All rights reserved. @@ -251,37 +251,37 @@ _PKGTASKS_CHECK_EGFILE= \ _pkgtasks-files-postinstall-check: .PHONY ${RUN}set -- args ${_CONF_FILES}; shift; \ while ${TEST} "$$#" -gt 0; do \ - ${TEST} "$$#" -gt 2 || break; \ + ${TEST} "$$#" -ge 2 || break; \ egfile="$$1"; shift 2; \ varname="CONF_FILES"; ${_PKGTASKS_CHECK_EGFILE}; \ done ${RUN}set -- args ${_CONF_FILES_PERMS}; shift; \ while ${TEST} "$$#" -gt 0; do \ - ${TEST} "$$#" -gt 5 || break; \ + ${TEST} "$$#" -ge 5 || break; \ egfile="$$1"; shift 5; \ varname="CONF_FILES_PERMS"; ${_PKGTASKS_CHECK_EGFILE}; \ done ${RUN}set -- args ${_REQD_FILES}; shift; \ while ${TEST} "$$#" -gt 0; do \ - ${TEST} "$$#" -gt 2 || break; \ + ${TEST} "$$#" -ge 2 || break; \ egfile="$$1"; shift 2; \ varname="REQD_FILES"; ${_PKGTASKS_CHECK_EGFILE}; \ done ${RUN}set -- args ${_REQD_FILES_PERMS}; shift; \ while ${TEST} "$$#" -gt 0; do \ - ${TEST} "$$#" -gt 5 || break; \ + ${TEST} "$$#" -ge 5 || break; \ egfile="$$1"; shift 5; \ varname="REQD_FILES_PERMS"; ${_PKGTASKS_CHECK_EGFILE}; \ done ${RUN}set -- args ${__INIT_SCRIPTS}; shift; \ while ${TEST} "$$#" -gt 0; do \ - ${TEST} "$$#" -gt 2 || break; \ + ${TEST} "$$#" -ge 2 || break; \ egfile="$$1"; shift 2; \ varname="INIT_SCRIPTS"; ${_PKGTASKS_CHECK_EGFILE}; \ done ${RUN}set -- args ${__INIT_SCRIPTS_PERMS}; shift; \ while ${TEST} "$$#" -gt 0; do \ - ${TEST} "$$#" -gt 5 || break; \ + ${TEST} "$$#" -ge 5 || break; \ egfile="$$1"; shift 5; \ varname="INIT_SCRIPTS_PERMS"; ${_PKGTASKS_CHECK_EGFILE}; \ done |