From 44ff8b518b3790454d41b2550879283e63327af2 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 11 Feb 2021 08:18:05 -0800 Subject: [PATCH] devops: fix win archiving logic (#5420) One can't use "for-of" iteration over bash arrays if values contain strings :( --- browser_patches/chromium/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/browser_patches/chromium/build.sh b/browser_patches/chromium/build.sh index 9efc35e6a7..8586a1fc35 100755 --- a/browser_patches/chromium/build.sh +++ b/browser_patches/chromium/build.sh @@ -206,10 +206,13 @@ EOF if [[ $(uname) == "Darwin" ]]; then COPY_COMMAND="ditto" fi - for file in ${CHROMIUM_FILES_TO_ARCHIVE[@]}; do + + for ((i = 0; i < ${#CHROMIUM_FILES_TO_ARCHIVE[@]}; i++)) do + file="${CHROMIUM_FILES_TO_ARCHIVE[$i]}" mkdir -p "output/${CHROMIUM_FOLDER_NAME}/$(dirname $file)" $COPY_COMMAND "${CR_CHECKOUT_PATH}/src/out/Default/${file}" "output/${CHROMIUM_FOLDER_NAME}/${file}" done + if [[ $1 == "--compile-win"* ]]; then $COPY_COMMAND "${CR_CHECKOUT_PATH}/src/out/Default/"*.manifest "output/${CHROMIUM_FOLDER_NAME}/" fi