From 3ed87e2ac2d8b16823457667faf658541dd8161a Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 6 Apr 2018 14:09:03 -0700 Subject: [PATCH] Fully resolve tmpdir in verify scripts, since it might be a symlink on macOS --- hack/verify-bazel.sh | 2 +- hack/verify-godeps.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/verify-bazel.sh b/hack/verify-bazel.sh index 132428fc12..4e49cdf2ab 100755 --- a/hack/verify-bazel.sh +++ b/hack/verify-bazel.sh @@ -31,7 +31,7 @@ fi # TODO(spxtr): Remove this line once Bazel is the only way to build. rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go" -_tmpdir="$(mktemp -d -t verify-bazel.XXXXXX)" +_tmpdir="$(kube::realpath $(mktemp -d -t verify-bazel.XXXXXX))" kube::util::trap_add "rm -rf ${_tmpdir}" EXIT _tmp_gopath="${_tmpdir}/go" diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index e97644015f..7938c310a7 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -35,7 +35,7 @@ kube::util::ensure_godep_version if [[ -z ${TMP_GOPATH:-} ]]; then # Create a nice clean place to put our new godeps - _tmpdir="$(mktemp -d -t gopath.XXXXXX)" + _tmpdir="$(kube::realpath $(mktemp -d -t gopath.XXXXXX))" else # reuse what we might have saved previously _tmpdir="${TMP_GOPATH}"