From 2f6c5e513cf6688f9343a25ac90138e9ad751eb5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 21 Mar 2017 20:01:25 +0100 Subject: [PATCH] support/check-bin-arch: fix for filenames with spaces Filenames with spaces will break the current for loop. Fix that by using a while-read loop, fed with the list of files on stdin, using process substitution. Reported-by: Peter Korsgaard Signed-off-by: "Yann E. MORIN" Cc: Peter Korsgaard Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/check-bin-arch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/support/scripts/check-bin-arch b/support/scripts/check-bin-arch index 2c619ad674..b3e2024617 100755 --- a/support/scripts/check-bin-arch +++ b/support/scripts/check-bin-arch @@ -18,9 +18,11 @@ fi exitcode=0 -pkg_files=$(sed -r -e "/^${package},(.+)$/!d; s//\1/;" ${pkg_list}) +# Only split on new lines, for filenames-with-spaces +IFS=" +" -for f in ${pkg_files} ; do +while read f; do # Skip firmware files, they could be ELF files for other # architectures if [[ "${f}" =~ ^\./(usr/)?lib/firmware/.* ]]; then @@ -43,10 +45,10 @@ for f in ${pkg_files} ; do continue fi - printf 'ERROR: architecture for %s is %s, should be %s\n' \ + printf 'ERROR: architecture for "%s" is "%s", should be "%s"\n' \ "${f}" "${arch}" "${arch_name}" exitcode=1 -done +done < <( sed -r -e "/^${package},\.(.+)$/!d; s//\1/;" ${pkg_list} ) exit ${exitcode} -- 2.30.2