diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index b03826e7449..057da6b1536 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -65,7 +65,7 @@ _kubetmp="${_kubetmp}/kubernetes" # Do all our work in the new GOPATH export GOPATH="${_tmpdir}" -pushd "${_kubetmp}" 2>&1 > /dev/null +pushd "${_kubetmp}" > /dev/null 2>&1 # Restore the Godeps into our temp directory hack/godep-restore.sh @@ -78,11 +78,11 @@ pushd "${_kubetmp}" 2>&1 > /dev/null # Recreate the Godeps using the nice clean set we just downloaded hack/godep-save.sh -popd 2>&1 > /dev/null +popd > /dev/null 2>&1 ret=0 -pushd "${KUBE_ROOT}" 2>&1 > /dev/null +pushd "${KUBE_ROOT}" > /dev/null 2>&1 # Test for diffs if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\":' Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then echo "Your Godeps.json is different:" >&2 @@ -117,9 +117,9 @@ pushd "${KUBE_ROOT}" 2>&1 > /dev/null fi ret=1 fi -popd 2>&1 > /dev/null +popd > /dev/null 2>&1 -if [[ ${ret} > 0 ]]; then +if [[ ${ret} -gt 0 ]]; then exit ${ret} fi