From owner-svn-ports-all@freebsd.org Fri Jun 1 16:20:59 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87AB4F78FF8; Fri, 1 Jun 2018 16:20:59 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E3DC84A75; Fri, 1 Jun 2018 16:20:56 +0000 (UTC) (envelope-from mat@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 CDF892B15C; Fri, 1 Jun 2018 16:20:55 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w51GKtZS004669; Fri, 1 Jun 2018 16:20:55 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w51GKtfc004664; Fri, 1 Jun 2018 16:20:55 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201806011620.w51GKtfc004664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 1 Jun 2018 16:20:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471274 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 471274 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.26 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: Fri, 01 Jun 2018 16:20:59 -0000 Author: mat Date: Fri Jun 1 16:20:54 2018 New Revision: 471274 URL: https://svnweb.freebsd.org/changeset/ports/471274 Log: SC2006: Use $(..) instead of legacy `..`. Backtick command substitution `STATEMENT` is legacy syntax with several issues. - It has a series of undefined behaviors related to quoting in POSIX. - It imposes a custom escaping mode with surprising results. - It's exceptionally hard to nest. $(STATEMENT) command substitution has none of these problems, and is therefore strongly encouraged. PR: 227109 Submitted by: mat Sponsored by: Absolight Modified: head/Mk/Scripts/actual-package-depends.sh (contents, props changed) head/Mk/Scripts/create-manifest.sh (contents, props changed) head/Mk/Scripts/find-lib.sh (contents, props changed) head/Mk/Scripts/qa.sh (contents, props changed) Modified: head/Mk/Scripts/actual-package-depends.sh ============================================================================== --- head/Mk/Scripts/actual-package-depends.sh Fri Jun 1 16:20:51 2018 (r471273) +++ head/Mk/Scripts/actual-package-depends.sh Fri Jun 1 16:20:54 2018 (r471274) @@ -17,7 +17,7 @@ resolv_symlink() { return fi - tgt=`readlink ${file}` + tgt=$(readlink ${file}) case $tgt in /*) echo $tgt Modified: head/Mk/Scripts/create-manifest.sh ============================================================================== --- head/Mk/Scripts/create-manifest.sh Fri Jun 1 16:20:51 2018 (r471273) +++ head/Mk/Scripts/create-manifest.sh Fri Jun 1 16:20:54 2018 (r471274) @@ -57,8 +57,8 @@ EOT [ -z "${dp_LICENSE}" ] || echo "licenses: [ ${dp_LICENSE} ]" [ -z "${dp_USERS}" ] || echo "users: [ ${dp_USERS} ]" [ -z "${dp_GROUPS}" ] || echo "groups: [ ${dp_GROUPS} ]" -[ -n "${dp_NO_ARCH}" ] && echo "arch : `${dp_PKG_BIN} config abi | tr '[:upper:]' '[:lower:]' | cut -d: -f1,2`:*" -[ -n "${dp_NO_ARCH}" ] && echo "abi : `${dp_PKG_BIN} config abi | cut -d: -f1,2`:*" +[ -n "${dp_NO_ARCH}" ] && echo "arch : $(${dp_PKG_BIN} config abi | tr '[:upper:]' '[:lower:]' | cut -d: -f1,2):*" +[ -n "${dp_NO_ARCH}" ] && echo "abi : $(${dp_PKG_BIN} config abi | cut -d: -f1,2):*" # Then the key/values sections echo "deps: { " Modified: head/Mk/Scripts/find-lib.sh ============================================================================== --- head/Mk/Scripts/find-lib.sh Fri Jun 1 16:20:51 2018 (r471273) +++ head/Mk/Scripts/find-lib.sh Fri Jun 1 16:20:54 2018 (r471274) @@ -22,12 +22,12 @@ if [ $# -ne 1 ]; then fi lib=$1 -dirs="${LIB_DIRS} `cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :`" +dirs="${LIB_DIRS} $(cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :)" for libdir in ${dirs} ; do test -f ${libdir}/${lib} || continue libfile=${libdir}/${lib} - [ `file -b -L --mime-type ${libfile}` = "application/x-sharedlib" ] || continue + [ $(file -b -L --mime-type ${libfile}) = "application/x-sharedlib" ] || continue echo $libfile break done Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Fri Jun 1 16:20:51 2018 (r471273) +++ head/Mk/Scripts/qa.sh Fri Jun 1 16:20:54 2018 (r471274) @@ -248,9 +248,9 @@ sharedmimeinfo() { suidfiles() { local filelist - filelist=`find ${STAGEDIR} -type f \ + filelist=$(find ${STAGEDIR} -type f \ \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ - \( -perm -u+s -or -perm -g+s \)` + \( -perm -u+s -or -perm -g+s \)) if [ -n "${filelist}" ]; then warn "setuid files in the stage directory (are these necessary?):" ls -liTd ${filelist} @@ -278,12 +278,12 @@ libperl() { # No results presents a blank line from heredoc. [ -z "${f}" ] && continue files=$((files+1)) - found=`readelf -d ${f} | awk "BEGIN {libperl=1; rpath=10; runpath=100} + found=$(readelf -d ${f} | awk "BEGIN {libperl=1; rpath=10; runpath=100} /NEEDED.*${LIBPERL}/ { libperl = 0 } /RPATH.*perl.*CORE/ { rpath = 0 } /RUNPATH.*perl.*CORE/ { runpath = 0 } END {print libperl+rpath+runpath} - "` + ") case "${found}" in *1) warn "${f} is not linked with ${LIBPERL}, not respecting lddlflags?"