Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Jul 2017 20:30:45 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r446850 - head/Mk/Scripts
Message-ID:  <201707282030.v6SKUjOC057776@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707282030.v6SKUjOC057776>