Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Nov 2015 21:10:15 +0000 (UTC)
From:      Brad Davis <brd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r291006 - projects/release-pkg
Message-ID:  <201511172110.tAHLAFx1087885@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brd (doc,ports committer)
Date: Tue Nov 17 21:10:15 2015
New Revision: 291006
URL: https://svnweb.freebsd.org/changeset/base/291006

Log:
  Don't match on "version" when found as a value.
  
  Approved by:	bapt

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Tue Nov 17 21:02:27 2015	(r291005)
+++ projects/release-pkg/Makefile.inc1	Tue Nov 17 21:10:15 2015	(r291006)
@@ -1272,8 +1272,10 @@ create-world-packages:
 			-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
 			${SRCDIR}/release/packages/$${pkgname}.ucl \
 			> ${DESTDIR}/$${pkgname}.ucl ; \
-		awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
-			${DESTDIR}/$${pkgname}.ucl ; \
+		awk -F\" ' \
+			/^name/ { printf("===> Creating %s-", $$2); next } \
+			/^version/ { print $$2; next } \
+			' ${DESTDIR}/$${pkgname}.ucl ; \
 		pkg -o ABI_FILE=${DESTDIR}/bin/sh \
 			create -M ${DESTDIR}/$${pkgname}.ucl \
 			-p ${DESTDIR}/$${pkgname}.plist \



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