From owner-dev-commits-doc-all@freebsd.org Mon Jan 4 18:51:12 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0A35B4C0954 for ; Mon, 4 Jan 2021 18:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8l8H6wG6z3k9G; Mon, 4 Jan 2021 18:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E05641EBBF; Mon, 4 Jan 2021 18:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 104IpBag027106; Mon, 4 Jan 2021 18:51:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 104IpB79027105; Mon, 4 Jan 2021 18:51:11 GMT (envelope-from git) Date: Mon, 4 Jan 2021 18:51:11 GMT Message-Id: <202101041851.104IpB79027105@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 77c28ff525 - main - docbuild: source 'local.conf' if it exists MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77c28ff5251dded5a6861b341742f9ed78b29277 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 18:51:12 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=77c28ff5251dded5a6861b341742f9ed78b29277 commit 77c28ff5251dded5a6861b341742f9ed78b29277 Author: Glen Barber AuthorDate: 2021-01-04 18:50:48 +0000 Commit: Glen Barber CommitDate: 2021-01-04 18:50:48 +0000 docbuild: source 'local.conf' if it exists Sponsored by: Rubicon Communications, LLC (netgate.com) --- share/tools/dobuild.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/tools/dobuild.sh b/share/tools/dobuild.sh index b83e00f0d1..c5752a3340 100755 --- a/share/tools/dobuild.sh +++ b/share/tools/dobuild.sh @@ -39,6 +39,10 @@ # WARNING! This script depend on dobuild_wrap.sh setting the # configuration variables in the enviroment. # +if [ -f "${PWD}/local.conf" ]; then + . ${PWD}/local.conf +fi + if [ -z "${DOBUILDWRAP}" ]; then echo "Error: This script should only be called from dobuild_wrap.sh!" exit 1