diff options
| author | jschauma <jschauma@pkgsrc.org> | 2006-07-30 14:31:10 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2006-07-30 14:31:10 +0000 |
| commit | a380b42fa0107aeef71bb58f060ac1d13b62c287 (patch) | |
| tree | 78e127b6ac0cee2d3de511d0c0941086b39b232f /mk | |
| parent | 5330cd533e25f39d76d0fddd615274629f0e0ff4 (diff) | |
| download | pkgsrc-a380b42fa0107aeef71bb58f060ac1d13b62c287.tar.gz | |
- use ${BMAKE} instead of 'make' in one instance
- if we can't build one of the required packages, bail out
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/upload | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/mk/bulk/upload b/mk/bulk/upload index dddfb1d6b90..8b59bd0f201 100644 --- a/mk/bulk/upload +++ b/mk/bulk/upload @@ -1,13 +1,26 @@ #!/bin/sh -# $NetBSD: upload,v 1.30 2006/06/22 11:09:18 joerg Exp $ +# $NetBSD: upload,v 1.31 2006/07/30 14:31:10 jschauma Exp $ # # Upload non-restricted binary pkgs to ftp server # +install_required() +{ + pkg=$1 + ( cd $pkg; ${BMAKE} bulk-install ) + if [ $? -gt 0 ]; then + echo "Unable to install required package $pkg!" + echo "Bailing out -- you're on your own." + exit 1 + fi +} + MD5="digest md5"; SHA1="digest sha1"; +REQUIRED_PACKAGES="pkgtools/pkglint net/rsync security/audit-packages" + opsys=`uname -s` case "$opsys" in NetBSD) BMAKE=make; @@ -68,12 +81,12 @@ upload_vulnerable="$TMP"/upload_vulnerable pkgsrcdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=_PKGSRCDIR` packages=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=PACKAGES` distdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=DISTDIR` -gzip_cmd=`cd pkgtools/pkglint; make show-var VARNAME=GZIP_CMD USE_TOOLS=gzip` +gzip_cmd=`cd pkgtools/pkglint; ${BMAKE} show-var VARNAME=GZIP_CMD USE_TOOLS=gzip` # Pull in some pkgs needed -( cd pkgtools/pkglint ; ${BMAKE} bulk-install ) -( cd net/rsync ; ${BMAKE} bulk-install ) -( cd security/audit-packages ; ${BMAKE} bulk-install ) +for pkg in ${REQUIRED_PACKAGES}; do + install_required $pkg +done echo "Making sure vulnerability-list is up-to-date:" if [ -z "$UPDATE_VULNERABILITY_LIST" -o "$UPDATE_VULNERABILITY_LIST" = "yes" ] |