From dba86ef31af31faa2727aeab5e237305f94dc921 Mon Sep 17 00:00:00 2001 From: Hui Zhu Date: Thu, 29 Apr 2021 18:12:21 +0800 Subject: [PATCH] ci/install_yq.sh: install_yq: Check version before return MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check the yq version before return. Fixes: #1776 Signed-off-by: Hui Zhu (cherry picked from commit d8896157df158f81bdf4a029839b7db9e1ae6fdc) Signed-off-by: Fabiano Fidêncio --- ci/install_yq.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/install_yq.sh b/ci/install_yq.sh index 502fe67a4a..b2923a6d2e 100755 --- a/ci/install_yq.sh +++ b/ci/install_yq.sh @@ -18,7 +18,9 @@ function install_yq() { GOPATH=${GOPATH:-${HOME}/go} local yq_path="${GOPATH}/bin/yq" local yq_pkg="github.com/mikefarah/yq" - [ -x "${GOPATH}/bin/yq" ] && return + local yq_version=3.4.1 + + [ -x "${GOPATH}/bin/yq" ] && [ "`${GOPATH}/bin/yq --version`"X == "yq version ${yq_version}"X ] && return read -r -a sysInfo <<< "$(uname -sm)" @@ -56,8 +58,6 @@ function install_yq() { die "Please install curl" fi - local yq_version=3.4.1 - ## NOTE: ${var,,} => gives lowercase value of var local yq_url="https://${yq_pkg}/releases/download/${yq_version}/yq_${goos,,}_${goarch}" curl -o "${yq_path}" -LSsf "${yq_url}"