pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/bulk Add --config <file> from build script
details: https://anonhg.NetBSD.org/pkgsrc/rev/e2ac54f8fe34
branches: trunk
changeset: 531209:e2ac54f8fe34
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Wed Jul 25 12:00:21 2007 +0000
description:
Add --config <file> from build script
diffstat:
mk/bulk/upload | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diffs (84 lines):
diff -r 974bf81696f4 -r e2ac54f8fe34 mk/bulk/upload
--- a/mk/bulk/upload Wed Jul 25 11:52:29 2007 +0000
+++ b/mk/bulk/upload Wed Jul 25 12:00:21 2007 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: upload,v 1.39 2007/07/25 10:57:44 adrianp Exp $
+# $NetBSD: upload,v 1.40 2007/07/25 12:00:21 adrianp Exp $
#
# Upload non-restricted binary pkgs to ftp server
@@ -23,10 +23,14 @@
$prog: Uploads binary packages.
-Usage: $prog [-n|--no-upload] [-d|--debug] [-v|--verbose]
+Usage: $prog [-c|--config <file>] [-n|--no-upload] [-d|--debug] [-v|--verbose]
$prog -h|--help
$prog -V|--version
+ -c | --config <file>
+ Load the following configuration file instead of
+ the default one.
+
-d|--debug Preserves some intermediate files to help
debug any problems.
@@ -58,6 +62,15 @@
EOF
}
+# print out error message and exit 1
+die () {
+ echo "$0: error:" 1>&2
+ for i in "$@"; do
+ echo " $i" 1>&2
+ done
+ exit 1
+}
+
prog=$0
debug=no
do_upload=yes
@@ -65,6 +78,11 @@
verbose=no
while test $# -gt 0; do
case "$1" in
+ -c|--config)
+ shift
+ BULK_BUILD_CONF=$1; shift
+ ;;
+
-d|--debug)
debug=yes
shift
@@ -161,14 +179,24 @@
export BATCH DEPENDS_TARGET
#
+# Find the configuration file.
+#
+BULK_BUILD_CONF="${BULK_BUILD_CONF-${scriptdir}/build.conf}"
+case $BULK_BUILD_CONF in
+ /*) ;;
+ *) BULK_BUILD_CONF="${PWD}/${BULK_BUILD_CONF}"
+esac
+
+#
# Get the variables MAKECONF, RSYNC_DST, RSYNC_OPTS from the bulk build
# configuration file.
#
-: ${BULK_BUILD_CONF="${scriptdir}/build.conf"} #"
-. "${BULK_BUILD_CONF}"
-. "${scriptdir}/post-build-conf"
-check_config_vars
-export_config_vars
+{ test -f "${BULK_BUILD_CONF}" \
+ && . "${BULK_BUILD_CONF}" \
+ && . "${scriptdir}/post-build-conf" \
+ && check_config_vars \
+ && export_config_vars
+} || die "Cannot load config file ${BULK_BUILD_CONF}, aborting."
cd $USR_PKGSRC
Home |
Main Index |
Thread Index |
Old Index