From owner-svn-src-projects@FreeBSD.ORG  Wed May  6 14:59:17 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 481A292A;
 Wed,  6 May 2015 14:59:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 36DA81151;
 Wed,  6 May 2015 14:59:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t46ExHdM041683;
 Wed, 6 May 2015 14:59:17 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t46ExHKx041682;
 Wed, 6 May 2015 14:59:17 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505061459.t46ExHKx041682@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 6 May 2015 14:59:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r282544 - projects/release-arm-redux/release
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2015 14:59:17 -0000

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