From owner-svn-ports-all@freebsd.org Thu Feb 6 16:43:53 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5DB252302C9; Thu, 6 Feb 2020 16:43:53 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48D4551pzXz4FWl; Thu, 6 Feb 2020 16:43:53 +0000 (UTC) (envelope-from 0mp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 396821EA2B; Thu, 6 Feb 2020 16:43:53 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 016GhrYl040943; Thu, 6 Feb 2020 16:43:53 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 016GhrXc040942; Thu, 6 Feb 2020 16:43:53 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202002061643.016GhrXc040942@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Thu, 6 Feb 2020 16:43:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525388 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 525388 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.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Feb 2020 16:43:53 -0000 Author: 0mp Date: Thu Feb 6 16:43:52 2020 New Revision: 525388 URL: https://svnweb.freebsd.org/changeset/ports/525388 Log: Improve implementation of install-missing-packages As suggested by mat@ in D23484, let's use a proper if statement here instead of short-circuits operators. Also, arguments to echo should be quoted and ECHO_CMD should be used instead of ECHO (see bsd.commands.mk for details). Reported by: mat Reviewed by: mat Approved by: portmgr Differential Revision: https://reviews.freebsd.org/D23535 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Feb 6 16:29:08 2020 (r525387) +++ head/Mk/bsd.port.mk Thu Feb 6 16:43:52 2020 (r525388) @@ -4332,8 +4332,9 @@ missing-packages: # Install missing dependencies from package install-missing-packages: @_dirs=$$(${MISSING-DEPENDS-LIST}); \ - [ -z "$${_dirs}" ] || \ - ${SU_CMD} "${PKG_BIN} install -A $$(${ECHO} $${_dirs} | ${SED} "s%${PORTSDIR}/%%g")" + if [ -n "$${_dirs}" ]; then \ + ${SU_CMD} "${PKG_BIN} install -A $$(${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g")"; \ + fi ################################################################ # Everything after here are internal targets and really