Skip to content

Commit

Permalink
Unbreak make makepatch.
Browse files Browse the repository at this point in the history
The glob in `find ./*` is handled by the shell and actually sorts the
files, so one needs to to ask find to sort the result, using `find -s`.

`find ./* -maxdepth 0` is not equivalent to `find . -maxdepth 0`, the
depth increases by one as `./x` is on level deeper than `.`.

Pointy hat:	bdrewery


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@523912 35697150-7ecd-e111-bb59-0022644237b5
  • Loading branch information
mat813 committed Jan 23, 2020
1 parent 43b24d8 commit d7ada25
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Mk/Scripts/smart_makepatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ std_patch_filename() {
patchdir_files_list() {
if [ -d "${PATCHDIR}" ]; then
(cd ${PATCHDIR} && \
find . -type f -name "patch-*" -maxdepth 0 \
find -s . -type f -name "patch-*" -maxdepth 1 \
2>/dev/null | sed -e 's,^\./,,; /\.orig$/d'
)
fi;
Expand Down Expand Up @@ -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 -s . -name "patch-*" 2>/dev/null)
for P in ${patch_list}; do
P=${P#./}
name=$(get_patch_name ${P})
Expand Down

0 comments on commit d7ada25

Please sign in to comment.