From 365f405b5fbc276e101e44665ff804c16123a2de Mon Sep 17 00:00:00 2001 From: gy95 Date: Thu, 13 May 2021 16:11:19 +0800 Subject: [PATCH] modify the way of getting GOPATH variable Signed-off-by: gy95 --- hack/karmada-bootstrap.sh | 2 +- hack/util.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/karmada-bootstrap.sh b/hack/karmada-bootstrap.sh index 8cf278567..db589b6ba 100755 --- a/hack/karmada-bootstrap.sh +++ b/hack/karmada-bootstrap.sh @@ -124,7 +124,7 @@ export REGISTRY="swr.ap-southeast-1.myhuaweicloud.com/karmada" make images GO111MODULE=on go install "github.com/karmada-io/karmada/cmd/karmadactl" -GOPATH=$(go env | grep GOPATH | awk -F '=' '{print $2}'| sed 's/\"//g') +GOPATH=$(go env GOPATH | awk -F ':' '{print $1}') KARMADACTL_BIN="${GOPATH}/bin/karmadactl" #step3. generate cert diff --git a/hack/util.sh b/hack/util.sh index f9719cbfa..fa8185804 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -53,7 +53,7 @@ function util::cmd_must_exist_cfssl { util::install_tools "github.com/cloudflare/cfssl/cmd/..." ${CFSSL_VERSION} - GOPATH=$(go env | grep GOPATH | awk -F '=' '{print $2}'| sed 's/\"//g') + GOPATH=$(go env GOPATH | awk -F ':' '{print $1}') CFSSL_BIN="${GOPATH}/bin/cfssl" CFSSLJSON_BIN="${GOPATH}/bin/cfssljson" if [[ ! -x ${CFSSL_BIN} || ! -x ${CFSSLJSON_BIN} ]]; then