Skip to content

K
k3s
Unverified Commit 26491cef authored by Christoph Blecker's avatar Christoph Blecker
Browse files
Options

Simplify output of ensure_godep_version

parent d3b838b6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/lib/util.sh
View file @ 26491cef
...@@ -495,7 +495,7 @@ kube::util::ensure_clean_working_dir() { ...@@ -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() { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment