Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Jul 2018 17:00:20 +0200
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        Sean Chittenden <seanc@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r473745 - head/security/teleport
Message-ID:  <20180702150020.p7ofpt6livhzixl3@ogg.in.absolight.net>
In-Reply-To: <201807021455.w62EtmRR069011@repo.freebsd.org>
References:  <201807021455.w62EtmRR069011@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--2kv3pujm7ylrftz2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Jul 02, 2018 at 02:55:48PM +0000, Sean Chittenden wrote:
> Author: seanc
> Date: Mon Jul  2 14:55:47 2018
> New Revision: 473745
> URL: https://svnweb.freebsd.org/changeset/ports/473745
>=20
> Log:
>   Optimize teleport build steps by invoking sed(1) and find(1) only once.
>  =20
>   Submitted by:	mat (mentor)
>   Approved by: 	mat (mentor, implicit)
>=20
> Modified:
>   head/security/teleport/Makefile
>=20
> Modified: head/security/teleport/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/security/teleport/Makefile	Mon Jul  2 14:28:58 2018	(r473744)
> +++ head/security/teleport/Makefile	Mon Jul  2 14:55:47 2018	(r473745)
> @@ -45,8 +45,9 @@ post-extract:
>  post-patch:
>  	@${REINPLACE_CMD} -e 's|^GITREF=3D.*|GITREF=3D${GH_TAG_COMMIT}|' \
>  		${WRKDIR}/${GO_TELEPORT_SRC_DIR}/version.mk
> -	@${FIND} ${WRKDIR} -type f -exec ${SED} -i '' -e 's|\/var\/lib|/var/db|=
g' {} \;
> -	@${FIND} ${WRKDIR} -type f -exec ${SED} -i '' -e 's|\/usr\/bin\/hostnam=
e|/bin/hostname|g' {} \;
> +	@${FIND} ${WRKDIR} -type f \
> +		-exec ${SED} -i '' -e 's|\/var\/lib|/var/db|g' {} \; \
> +		-exec ${SED} -i '' -e 's|\/usr\/bin\/hostname|/bin/hostname|g' {} \;

You are still executing sed twice for each file.

-exec ${SED} -i '' -e 's|\/var\/lib|/var/db|g; s|\/usr\/bin\/hostname|/bin/=
hostname|g' {} +

--=20
Mathieu Arnold

--2kv3pujm7ylrftz2
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQJ8BAABCgBmBQJbOj4DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz
QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IKOMP/jdMGJ64kCAFWZaQw0evKPbe
zuuOMQVetr4BJwECPg+Yf8v1AjfWVF+6iDayHcoMb5/tETchLJx/CpAiBjUYD+I1
kungy7Dmtm/FdsMKLqROovUTnsQF813PsX4idOjKknHQ/2c8AaVsdq60KO+sUMMr
Ui2JryoLvKAnbqUwQi2uUPanGOkPad9v7DxUNdPrYLgzfVcBYtRB/nQMiONB6fts
ezCxod5vPM4gTk8dXYO8SF8F3fJUD506B53MB5xyvHtMk5PQQvJ/rCd/GYXIaFQE
SYQZKn6bfVw0a9RSlUU+6yvr4M4K0ilFc1jb7LcTVM++0uyX1oxy0NZb4ltWJJYy
aZ0cqCIrVJ7rvINBGCG2AWmKnch4rrYlTn1Lz1tFgY6bnrY6gjx3ZHjji62iRkW0
c7WkCiiyujpg5ISTRN7WDKLolotif6+v7MBQi506+L9Rsi1fV/2w5HgBE2SLJLVE
2N/U+Bo04W/oKTw4cCUvAh4vo8apgevBr2Yayfw8Tykom7Z4KXzMX6eBWNFbKlCh
Bf38+U96MryhmsumfzfkHVvYHPSLyMYpGrFUIIjtVv08fotFmBDcSktOKEqDplyB
QnOiEuSX21MU8evhcuJ4LAWPdWCiL6XZjDy2uhw05es/hxWGWF2oVtPRAmzqQ5jc
rs3Ijpc4N1Y6Tz/s+2gS
=FsYZ
-----END PGP SIGNATURE-----

--2kv3pujm7ylrftz2--



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