From 260bedb8bad634d82c4ea77ab19a517e8d50d789 Mon Sep 17 00:00:00 2001 From: John Howard Date: Sun, 6 Dec 2015 14:37:07 -0800 Subject: [PATCH] Windows CI Fix: Allow bash v4 Signed-off-by: John Howard Upstream-commit: c07e79fa8adfaf8e110803c9d1ad2cf6cbc67ee9 Component: engine --- components/engine/contrib/download-frozen-image-v2.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/engine/contrib/download-frozen-image-v2.sh b/components/engine/contrib/download-frozen-image-v2.sh index 196d4b532a..ca48646b97 100755 --- a/components/engine/contrib/download-frozen-image-v2.sh +++ b/components/engine/contrib/download-frozen-image-v2.sh @@ -56,6 +56,13 @@ while [ $# -gt 0 ]; do layersFs=$(echo "$manifestJson" | jq --raw-output '.fsLayers | .[] | .blobSum') IFS=$'\n' + # bash v4 on Windows CI requires CRLF seperator + if [ "$(go env GOHOSTOS)" = 'windows' ]; then + major=$(echo ${BASH_VERSION%%[^0.9]} | cut -d. -f1) + if [ "$major" -ge 4 ]; then + IFS=$'\r\n' + fi + fi layers=( ${layersFs} ) unset IFS