svn commit: r473745 - head/security/teleport

Mathieu Arnold mat at FreeBSD.org
Mon Jul 2 15:00:22 UTC 2018


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
> 
> Log:
>   Optimize teleport build steps by invoking sed(1) and find(1) only once.
>   
>   Submitted by:	mat (mentor)
>   Approved by: 	mat (mentor, implicit)
> 
> Modified:
>   head/security/teleport/Makefile
> 
> Modified: head/security/teleport/Makefile
> ==============================================================================
> --- 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=.*|GITREF=${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\/hostname|/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' {} +

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20180702/e09c00f2/attachment.sig>


More information about the svn-ports-all mailing list