Date: Wed, 6 May 2015 14:59:17 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282544 - projects/release-arm-redux/release Message-ID: <201505061459.t46ExHKx041682@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed May 6 14:59:16 2015 New Revision: 282544 URL: https://svnweb.freebsd.org/changeset/base/282544 Log: Move where the configuration file is sourced if '-c' is specified. If the configuration file does not exist, proceed with the default options instead of exiting. Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/release.sh Modified: projects/release-arm-redux/release/release.sh ============================================================================== --- projects/release-arm-redux/release/release.sh Wed May 6 14:53:34 2015 (r282543) +++ projects/release-arm-redux/release/release.sh Wed May 6 14:59:16 2015 (r282544) @@ -328,12 +328,6 @@ main() { case ${opt} in c) RELEASECONF="${OPTARG}" - if [ ! -e "${RELEASECONF}" ]; then - echo "ERROR: Configuration file ${RELEASECONF} does not exist." - exit 1 - fi - # Source the specified configuration file for overrides - . ${RELEASECONF} ;; \?) usage @@ -341,6 +335,14 @@ main() { esac done shift $(($OPTIND - 1)) + if [ ! -z "${RELEASECONF}" ]; then + if [ -e "${RELEASECONF}" ]; then + . ${RELEASECONF} + else + echo "Nonexistent configuration file: ${RELEASECONF}" + echo "Using default build environment." + fi + fi env_check trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit chroot_setup
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505061459.t46ExHKx041682>