github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 16:27:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #430 from devimc/topic/scripts/fixYqNotFound

Browse Source 
scripts: set a default path to the yq binary
This commit is contained in:
Salvador Fuentes
2020-03-12 12:30:00 -06:00
committed by GitHub
parent 397ce26948 1c063afc5f
commit 9e0807a7f5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/lib.sh
View File

@@ -382,8 +382,8 @@ RUN ln -sf /usr/bin/g++ /bin/musl-g++
detect_go_version() detect_go_version()
{ {
info "Detecting agent go version" info "Detecting agent go version"
typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq) typeset yq=$(command -v yq || command -v ${GOPATH}/bin/yq || echo "${GOPATH}/bin/yq")
if [ -z "$yq" ]; then if [ ! -f "$yq" ]; then
source "$yq_file" source "$yq_file"
fi fi
@@ -428,8 +428,8 @@ detect_go_version()
detect_rust_version() detect_rust_version()
{ {
info "Detecting agent rust version" info "Detecting agent rust version"
typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq) typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq || echo "${GOPATH}/bin/yq")
if [ -z "$yq" ]; then if [ ! -f "$yq" ]; then
source "$yq_file" source "$yq_file"
fi fi
@@ -475,8 +475,8 @@ detect_cmake_version()
{ {
info "Detecting cmake version" info "Detecting cmake version"
typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq) typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq || echo "${GOPATH}/bin/yq")
if [ -z "$yq" ]; then if [ ! -f "$yq" ]; then
source "$yq_file" source "$yq_file"
fi fi
@@ -522,8 +522,8 @@ detect_musl_version()
{ {
info "Detecting musl version" info "Detecting musl version"
typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq) typeset -r yq=$(command -v yq || command -v ${GOPATH}/bin/yq || echo "${GOPATH}/bin/yq")
if [ -z "$yq" ]; then if [ ! -f "$yq" ]; then
source "$yq_file" source "$yq_file"
fi fi