From 18fcbbe1a1d53704f2d2f483e11b6950efc2765a Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 21 Nov 2017 16:08:51 +0100 Subject: [PATCH] depot: support path names including spaces Related to #2582 --- tool/depot/mk/extract.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tool/depot/mk/extract.inc b/tool/depot/mk/extract.inc index 1ab5d9e5e..eb113300d 100644 --- a/tool/depot/mk/extract.inc +++ b/tool/depot/mk/extract.inc @@ -193,12 +193,8 @@ _check_hash: $(DEPOT_ARCHIVE_DIR).hash checked_recipe_hash_value_exists # # The command is invoked from within the archive directory within the depot. # -# The 'echo' right before 'cat' is needed to handle the special case where -# 'find' is executed in an empty directory (yielding an empty result), which -# would otherwise prompt 'cat' to block for standard input. -# HASH_CMD := cd $(DEPOT_ARCHIVE_DIR); \ - echo | cat `find . -type f | sort` | $(HASHSUM) | sed "s/ .*//" \ + find . -type f | sort | xargs -d '\n' cat | $(HASHSUM) | sed "s/ .*//" # # Generate the hash from the archive content