From owner-svn-ports-all@freebsd.org  Mon Aug 20 00:39:33 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-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 AF969107D7C8;
 Mon, 20 Aug 2018 00:39:33 +0000 (UTC)
 (envelope-from gerald@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 5A75071E82;
 Mon, 20 Aug 2018 00:39:33 +0000 (UTC)
 (envelope-from gerald@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 386C260AF;
 Mon, 20 Aug 2018 00:39:33 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7K0dWH9069394;
 Mon, 20 Aug 2018 00:39:32 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7K0dWbM069393;
 Mon, 20 Aug 2018 00:39:32 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <201808200039.w7K0dWbM069393@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Mon, 20 Aug 2018 00:39:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r477615 - head/Tools/scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: gerald
X-SVN-Commit-Paths: head/Tools/scripts
X-SVN-Commit-Revision: 477615
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2018 00:39:33 -0000

Author: gerald
Date: Mon Aug 20 00:39:32 2018
New Revision: 477615
URL: https://svnweb.freebsd.org/changeset/ports/477615

Log:
  Use 'make -C' instead of saving the current working directory and then
  restoring that in the new code to add a safety belt that came in via
  revision 477561.  This is quite a bit simpler and shorter.
  
  Reported by:	adamw
  PR:		226926

Modified:
  head/Tools/scripts/bump-revision.sh

Modified: head/Tools/scripts/bump-revision.sh
==============================================================================
--- head/Tools/scripts/bump-revision.sh	Mon Aug 20 00:38:40 2018	(r477614)
+++ head/Tools/scripts/bump-revision.sh	Mon Aug 20 00:39:32 2018	(r477615)
@@ -49,10 +49,7 @@ while [ $# -gt 0 ]
 do
     if [ -f "$1/Makefile" ]; then
         # See what the port thinks its PORTREVISION is and save that.
-        startdir=`pwd`
-        cd "$1"
-        pre=$(make -V PORTREVISION)
-        cd "$startdir"
+        pre=$(make -C "$1" -V PORTREVISION)
 
         # If the Makefile exists, continue and empty the tempfile, set up variables
 	echo -n > $tempfile
@@ -100,9 +97,7 @@ do
             fi
 
             # See what the port now has for PORTREVISION.
-            cd "$1"
-            post=$(make -V PORTREVISION)
-            cd "$startdir"
+            post=$(make -C "$1" -V PORTREVISION)
 
             if [ "$post" -le "$pre" ]; then
                 printc "ERROR: $1 PORTREVISION went backwards from $pre to $post!" "red"