Date: Tue, 21 Jan 2020 20:36:14 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523738 - head/Mk/Scripts Message-ID: <202001212036.00LKaEwl076283@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Jan 21 20:36:14 2020 New Revision: 523738 URL: https://svnweb.freebsd.org/changeset/ports/523738 Log: find(1) doesn't need a glob to search for patches. This change also avoids cmdline length errors and other subst parsing issues that were previously targeted. Sponsored by: DellEMC Modified: head/Mk/Scripts/smart_makepatch.sh Modified: head/Mk/Scripts/smart_makepatch.sh ============================================================================== --- head/Mk/Scripts/smart_makepatch.sh Tue Jan 21 19:57:24 2020 (r523737) +++ head/Mk/Scripts/smart_makepatch.sh Tue Jan 21 20:36:14 2020 (r523738) @@ -69,7 +69,7 @@ std_patch_filename() { patchdir_files_list() { if [ -d "${PATCHDIR}" ]; then (cd ${PATCHDIR} && \ - find ./* -type f -name "patch-*" -maxdepth 0 \ + find . -type f -name "patch-*" -maxdepth 0 \ 2>/dev/null | sed -e 's,^\./,,; /\.orig$/d' ) fi; @@ -186,7 +186,7 @@ regenerate_patches() { local ORIG local new_list new_list=$(cd "${PATCH_WRKSRC}" && \ - find -s ./* -type f -name '*.orig' 2>/dev/null) + find -s . -type f -name '*.orig' 2>/dev/null) (cd "${PATCH_WRKSRC}" && for F in ${new_list}; do ORIG=${F#./} NEW=${ORIG%.orig} @@ -216,7 +216,7 @@ stage_patches() { local P local name local patch_list - patch_list=$(cd ${REGENNED} && find ./* -name "patch-*" 2>/dev/null) + patch_list=$(cd ${REGENNED} && find . -name "patch-*" 2>/dev/null) for P in ${patch_list}; do P=${P#./} name=$(get_patch_name ${P})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001212036.00LKaEwl076283>