From owner-svn-ports-all@freebsd.org  Fri Jul 28 20:30:46 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DAD3DCE418;
 Fri, 28 Jul 2017 20:30:46 +0000 (UTC)
 (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id 0779B6FB04;
 Fri, 28 Jul 2017 20:30:45 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6SKUjTr057777;
 Fri, 28 Jul 2017 20:30:45 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6SKUjOC057776;
 Fri, 28 Jul 2017 20:30:45 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201707282030.v6SKUjOC057776@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 28 Jul 2017 20:30:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r446850 - head/Mk/Scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/Mk/Scripts
X-SVN-Commit-Revision: 446850
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.23
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: Fri, 28 Jul 2017 20:30:46 -0000

Author: bdrewery
Date: Fri Jul 28 20:30:44 2017
New Revision: 446850
URL: https://svnweb.freebsd.org/changeset/ports/446850

Log:
  Exec less rm(1) for existing files.
  
  Reported by:	mjg
  Approved by:	portmgr (implicit)

Modified:
  head/Mk/Scripts/create-manifest.sh

Modified: head/Mk/Scripts/create-manifest.sh
==============================================================================
--- head/Mk/Scripts/create-manifest.sh	Fri Jul 28 19:27:51 2017	(r446849)
+++ head/Mk/Scripts/create-manifest.sh	Fri Jul 28 20:30:44 2017	(r446850)
@@ -89,11 +89,19 @@ fi
 cp ${dp_DESCR} ${dp_METADIR}/+DESC
 
 # Concatenate all the scripts
+output_files=
 for stage in INSTALL DEINSTALL UPGRADE; do
 	for prepost in '' PRE POST; do
+		output=${dp_METADIR}/+${prepost:+${prepost}_}${stage}
+		[ -f "${output}" ] && output_files="${output_files:+${output_files} }${output}"
+	done
+done
+[ -n "${output_files}" ] && rm -f ${output_files}
+
+for stage in INSTALL DEINSTALL UPGRADE; do
+	for prepost in '' PRE POST; do
 		eval files="\${dp_PKG${prepost}${stage}}"
 		output=${dp_METADIR}/+${prepost:+${prepost}_}${stage}
-		rm -f ${output}
 		for input in ${files}; do
 			[ -f "${input}" ] && cat ${input} >> ${output}
 		done