@@ -18,7 +18,7 @@ set -o errexit
18
18
set -o nounset
19
19
set -o pipefail
20
20
21
- KUBE_ROOT=$( dirname " ${BASH_SOURCE} " ) /..
21
+ KUBE_ROOT=$( dirname " ${BASH_SOURCE[0] } " ) /..
22
22
KUBE_REMOTE_RUNTIME_ROOT=" ${KUBE_ROOT} /staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
23
23
source " ${KUBE_ROOT} /hack/lib/init.sh"
24
24
@@ -40,22 +40,24 @@ if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
40
40
fi
41
41
42
42
function cleanup {
43
- rm -f ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go.bak
43
+ rm -f " ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go.bak"
44
+ rm -f " ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go.tmp"
44
45
}
45
46
46
47
trap cleanup EXIT
47
48
48
- gogopath=$( dirname $( kube::util::find-binary " protoc-gen-gogo" ) )
49
+ gogopath=$( dirname " $( kube::util::find-binary " protoc-gen-gogo" ) " )
49
50
50
51
PATH=" ${gogopath} :${PATH} " \
51
52
protoc \
52
53
--proto_path=" ${KUBE_REMOTE_RUNTIME_ROOT} " \
53
54
--proto_path=" ${KUBE_ROOT} /vendor" \
54
- --gogo_out=plugins=grpc:${KUBE_REMOTE_RUNTIME_ROOT} ${KUBE_REMOTE_RUNTIME_ROOT} /api.proto
55
+ --gogo_out=plugins=grpc:" ${KUBE_REMOTE_RUNTIME_ROOT} " " ${KUBE_REMOTE_RUNTIME_ROOT} /api.proto"
55
56
56
57
# Update boilerplate for the generated file.
57
- echo " $( cat hack/boilerplate/boilerplate.generatego.txt ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go) " > ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go
58
+ cat hack/boilerplate/boilerplate.generatego.txt " ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go" > " ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go.tmp"
59
+ mv " ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go.tmp" " ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go"
58
60
59
61
# Run gofmt to clean up the generated code.
60
62
kube::golang::verify_go_version
61
- gofmt -l -s -w ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go
63
+ gofmt -l -s -w " ${KUBE_REMOTE_RUNTIME_ROOT} /api.pb.go"
0 commit comments