Fix make apimachinery on mac

Without GOBIN set apimachinery was failing on macos Catalina
kubernetes · Feb 3, 2020 · 09dea2e · 09dea2e
1 parent df54367
commit 09dea2e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/hack/make-apimachinery.sh b/hack/make-apimachinery.sh
@@ -18,27 +18,27 @@
 
 . $(dirname "${BASH_SOURCE}")/common.sh
 
-WORK_DIR=`mktemp -d`
+WORK_DIR=$(mktemp -d)
 
 cleanup() {
   chmod -R +w "${WORK_DIR}"
   rm -rf "${WORK_DIR}"
 }
 trap cleanup EXIT
 
-mkdir -p ${WORK_DIR}/go/
-ln -s ${GOPATH}/src/k8s.io/kops/vendor/ ${WORK_DIR}/go/src
+mkdir -p "${WORK_DIR}/go/"
+cp -R "${GOPATH}/src/k8s.io/kops/vendor/" "${WORK_DIR}/go/src"
 
 unset GOBIN
-GOPATH=${WORK_DIR}/go/ go install -v k8s.io/code-generator/cmd/conversion-gen/
-cp ${WORK_DIR}/go/bin/conversion-gen ${GOPATH}/bin/
 
-GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/deepcopy-gen/
-cp ${WORK_DIR}/go/bin/deepcopy-gen ${GOPATH}/bin/
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -v k8s.io/code-generator/cmd/conversion-gen/
+cp "${WORK_DIR}/go/bin/conversion-gen" "${GOPATH}/bin/"
 
-GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/defaulter-gen/
-cp ${WORK_DIR}/go/bin/defaulter-gen ${GOPATH}/bin/
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/deepcopy-gen/
+cp "${WORK_DIR}/go/bin/deepcopy-gen" "${GOPATH}/bin/"
 
-GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/client-gen/
-cp ${WORK_DIR}/go/bin/client-gen ${GOPATH}/bin/
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/defaulter-gen/
+cp "${WORK_DIR}/go/bin/defaulter-gen" "${GOPATH}/bin/"
 
+env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/client-gen/
+cp "${WORK_DIR}/go/bin/client-gen" "${GOPATH}/bin/"