Date: Fri, 6 Feb 2015 15:34:10 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278317 - head/tools/tools/makeroot Message-ID: <201502061534.t16FYAvh076650@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Fri Feb 6 15:34:10 2015 New Revision: 278317 URL: https://svnweb.freebsd.org/changeset/base/278317 Log: Handle invocation with neither of -e / -f Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D1780 Modified: head/tools/tools/makeroot/makeroot.sh Modified: head/tools/tools/makeroot/makeroot.sh ============================================================================== --- head/tools/tools/makeroot/makeroot.sh Fri Feb 6 14:44:29 2015 (r278316) +++ head/tools/tools/makeroot/makeroot.sh Fri Feb 6 15:34:10 2015 (r278317) @@ -165,13 +165,15 @@ if [ -n "${FILELIST}" ]; then awk ' !/ type=/ { file = $1 } / type=/ { if ($1 == file) {print} }' >> ${manifest} -else +elif [ -n "${EXTRAS}" ]; then # Start with all the files in BSDROOT/METALOG except those in # one of the EXTRAS manifests. grep -h type=file ${EXTRAS} | cut -d' ' -f1 | \ sort -u ${BSDROOT}/METALOG - | awk ' !/ type=/ { file = $1 } / type=/ { if ($1 != file) {print} }' >> ${manifest} +else + sort -u ${BSDROOT}/METALOG >> ${manifest} fi # For each extras file, add contents keys relative to the directory the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502061534.t16FYAvh076650>