github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Simplify output of ensure_godep_version

Browse Source
This commit is contained in:
Christoph Blecker 2017-05-23 22:39:59 -07:00
parent d3b838b608
commit 26491cef81
No known key found for this signature in database
GPG Key ID: B34A59A9D39F838B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/lib/util.sh
View File

@ -495,7 +495,7 @@ kube::util::ensure_clean_working_dir() {
# Ensure that the given godep version is installed and in the path # Ensure that the given godep version is installed and in the path
kube::util::ensure_godep_version() { kube::util::ensure_godep_version() {
GODEP_VERSION=${1:-"v79"} GODEP_VERSION=${1:-"v79"}
if [[ "$(godep version)" == *"godep ${GODEP_VERSION}"* ]]; then if [[ "$(godep version 2>/dev/null)" == *"godep ${GODEP_VERSION}"* ]]; then
return return
fi fi
@ -504,7 +504,7 @@ kube::util::ensure_godep_version() {
GOPATH="${KUBE_TEMP}/go" go get -d -u github.com/tools/godep 2>/dev/null GOPATH="${KUBE_TEMP}/go" go get -d -u github.com/tools/godep 2>/dev/null
pushd "${KUBE_TEMP}/go/src/github.com/tools/godep" >/dev/null pushd "${KUBE_TEMP}/go/src/github.com/tools/godep" >/dev/null
git checkout "${GODEP_VERSION}" git checkout -q "${GODEP_VERSION}"
GOPATH="${KUBE_TEMP}/go" go install . GOPATH="${KUBE_TEMP}/go" go install .
popd >/dev/null popd >/dev/null