Date: Sat, 9 Mar 2019 18:39:07 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r495191 - branches/2019Q1/Mk/Scripts Message-ID: <201903091839.x29Id7xs013436@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Mar 9 18:39:07 2019 New Revision: 495191 URL: https://svnweb.freebsd.org/changeset/ports/495191 Log: MFH: r495190 Respect UID_FILES. Reported by: dvl Tested by: dvl Approved by: portmgr (implicit) Modified: branches/2019Q1/Mk/Scripts/check_leftovers.sh Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/Mk/Scripts/check_leftovers.sh ============================================================================== --- branches/2019Q1/Mk/Scripts/check_leftovers.sh Sat Mar 9 18:38:18 2019 (r495190) +++ branches/2019Q1/Mk/Scripts/check_leftovers.sh Sat Mar 9 18:39:07 2019 (r495191) @@ -45,7 +45,10 @@ fi if [ -z "${CCACHE_DIR}" ]; then CCACHE_DIR=$(make -C ${portdir} -VCCACHE_DIR) fi -homedirs=$(awk -F: -v users="$(make -C ${portdir} -V USERS|sed -e 's, ,|,g;/^$/d;s,^,^(,;s,$,)$,')" 'users && $1 ~ users {print $9}' ${PORTSDIR}/UIDs|sort -u|sed -e "s|/usr/local|${PREFIX}|"|tr "\n" " ") +if [ -z "${UID_FILES}" ]; then + UID_FILES=$(make -C ${portdir} -VUID_FILES) +fi +homedirs=$(awk -F: -v users="$(make -C ${portdir} -V USERS|sed -e 's, ,|,g;/^$/d;s,^,^(,;s,$,)$,')" 'users && $1 ~ users {print $9}' ${UID_FILES}|sort -u|sed -e "s|/usr/local|${PREFIX}|"|tr "\n" " ") plistsub_sed=$(mktemp -t plistsub_sed) trap "rm -f ${plistsub_sed}" EXIT 1 make -C ${portdir} -VPLIST_SUB_SED | /bin/sh ${PORTSDIR}/Mk/Scripts/plist_sub_sed_sort.sh ${plistsub_sed}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903091839.x29Id7xs013436>