diff options
| author | rillig <rillig@pkgsrc.org> | 2005-11-10 07:11:37 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-11-10 07:11:37 +0000 |
| commit | 4f7ff6386594d6c35cec7d019ade61145c2c8613 (patch) | |
| tree | cd3f0070655c22c19da73a2e79f714ee416fc51b | |
| parent | 894798adca7f064483bc4285bffcca54b7e7e9d4 (diff) | |
| download | pkgsrc-4f7ff6386594d6c35cec7d019ade61145c2c8613.tar.gz | |
Replaced another instance of grep|awk with a simple awk. A warning is
printed if no package name could be found for a package directory.
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 3a5814f640e..e9a10b7e184 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.92 2005/11/10 07:04:00 rillig Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.93 2005/11/10 07:11:37 rillig Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -365,8 +365,8 @@ bulk-package: ${SHCOMMENT} "Install required depends via binarypkgs XXX" ; \ ${ECHO_MSG} "BULK> Installing packages which are required to build ${PKGNAME}." ;\ for pkgdir in `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}` ${BULK_PREREQ} ; do \ - pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ; \ - if [ -z "$$pkgname" ]; then continue ; fi ;\ + pkgname=`${AWK} '$$1 == "'"$$pkgdir"'" { print $$2; }' ${INDEXFILE}`; \ + if [ -z "$$pkgname" ]; then ${ECHO} "BULK> WARNING: could not find package name for directory $$pkgdir"; continue ; fi ;\ pkgfile=${PACKAGES}/All/$${pkgname}${PKG_SUFX} ;\ if ${PKG_INFO} -qe $$pkgname ; then \ ${ECHO_MSG} "BULK> Required package $$pkgname ($$pkgdir) is already installed" ; \ |