From owner-svn-src-all@freebsd.org Mon Aug 20 19:39:50 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DE27107A956; Mon, 20 Aug 2018 19:39:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F12B67E1E2; Mon, 20 Aug 2018 19:39:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D107B19A32; Mon, 20 Aug 2018 19:39:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7KJdnEf080493; Mon, 20 Aug 2018 19:39:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7KJdngc080492; Mon, 20 Aug 2018 19:39:49 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201808201939.w7KJdngc080492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 20 Aug 2018 19:39:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338114 - head/usr.sbin/mergemaster X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/usr.sbin/mergemaster X-SVN-Commit-Revision: 338114 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2018 19:39:50 -0000 Author: imp Date: Mon Aug 20 19:39:49 2018 New Revision: 338114 URL: https://svnweb.freebsd.org/changeset/base/338114 Log: mergemaster: better defaults for SOURCEDIR If we can't find a Makefile.inc1 in the specified / default SOURCEDIR, and there's a Makefile.inc1 in the current directory, offer the user the choice of using . for SOURCEDIR. Differential Revsion: https://reviews.freebsd.org/D16709 Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Mon Aug 20 19:09:39 2018 (r338113) +++ head/usr.sbin/mergemaster/mergemaster.sh Mon Aug 20 19:39:49 2018 (r338114) @@ -483,6 +483,27 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \ sleep 3 SOURCEDIR=${SOURCEDIR}/.. fi +if [ ! -f ${SOURCEDIR}/Makefile.inc1 ]; then + echo "*** ${SOURCEDIR} was not found." + if [ -f ./Makefile.inc1 ]; then + echo " Found Makefile.inc1 in the current directory." + echo -n " Would you like to set SOURCEDIR to $(pwd)? [no and exit] " + read SRCDOT + case "${SRCDOT}" in + [yY]*) + echo " *** Setting SOURCEDIR to $(pwd)" + SOURCEDIR=$(pwd) + ;; + *) + echo " **** No suitable ${SOURCEDIR} found, exiting" + exit 1 + ;; + esac + else + echo " **** No suitable ${SOURCEDIR} found, exiting" + exit 1 + fi +fi SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR