Fix gojsontoyaml binary issues

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

Makefile

@@ -19,7 +19,7 @@ generate: vendor ${MANIFESTS} **.md
 ${MANIFESTS}: $(JSONNET) $(GOJSONTOYAML) vendor example.jsonnet build.sh
 	@rm -rf ${MANIFESTS}
 	@mkdir -p ${MANIFESTS}
-	JSONNET=$(JSONNET) ./build.sh
+	JSONNET=$(JSONNET) GOJSONTOYAML=$(GOJSONTOYAML) ./build.sh
 
 .PHONY: fmt
 fmt: $(JSONNETFMT)

README.md

@@ -124,20 +124,23 @@ set -x
 set -o pipefail
 
 JSONNET=${JSONNET:-jsonnet}
+GOJSONTOYAML=${GOJSONTOYAML:-gojsontoyaml}
 
 # Make sure to start with a clean 'manifests' dir
 rm -rf manifests
 mkdir manifests
 
 # optional, but we would like to generate yaml, not json
-${JSONNET} -J vendor -m manifests "${1-example.jsonnet}" | xargs -I{} sh -c 'cat {} | gojsontoyaml > {}.yaml; rm -f {}' -- {}
+${JSONNET} -J vendor -m manifests "${1-example.jsonnet}" | xargs -I{} sh -c "cat {} | ${GOJSONTOYAML} > {}.yaml; rm -f {}" -- {}
+find manifests -type f ! -name '*.yaml' -delete
 
 # The following script generates all components, mostly used for testing
 
 rm -rf examples/all/manifests
 mkdir examples/all/manifests
 
-${JSONNET} -J vendor -m examples/all/manifests "${1-all.jsonnet}" | xargs -I{} sh -c 'cat {} | gojsontoyaml > {}.yaml; rm -f {}' -- {}
+${JSONNET} -J vendor -m examples/all/manifests "${1-all.jsonnet}" | xargs -I{} sh -c "cat {} | ${GOJSONTOYAML} > {}.yaml; rm -f {}" -- {}
+find examples/all/manifests -type f ! -name '*.yaml' -delete
 ```
 
 > Note you need `jsonnet` (`go get github.com/google/go-jsonnet/cmd/jsonnet`) and `gojsontoyaml` (`go get github.com/brancz/gojsontoyaml`) installed to run `build.sh`. If you just want json output, not yaml, then you can skip the pipe and everything afterwards.

build.sh

@@ -8,17 +8,20 @@ set -x
 set -o pipefail
 
 JSONNET=${JSONNET:-jsonnet}
+GOJSONTOYAML=${GOJSONTOYAML:-gojsontoyaml}
 
 # Make sure to start with a clean 'manifests' dir
 rm -rf manifests
 mkdir manifests
 
 # optional, but we would like to generate yaml, not json
-${JSONNET} -J vendor -m manifests "${1-example.jsonnet}" | xargs -I{} sh -c 'cat {} | gojsontoyaml > {}.yaml; rm -f {}' -- {}
+${JSONNET} -J vendor -m manifests "${1-example.jsonnet}" | xargs -I{} sh -c "cat {} | ${GOJSONTOYAML} > {}.yaml; rm -f {}" -- {}
+find manifests -type f ! -name '*.yaml' -delete
 
 # The following script generates all components, mostly used for testing
 
 rm -rf examples/all/manifests
 mkdir examples/all/manifests
 
-${JSONNET} -J vendor -m examples/all/manifests "${1-all.jsonnet}" | xargs -I{} sh -c 'cat {} | gojsontoyaml > {}.yaml; rm -f {}' -- {}
+${JSONNET} -J vendor -m examples/all/manifests "${1-all.jsonnet}" | xargs -I{} sh -c "cat {} | ${GOJSONTOYAML} > {}.yaml; rm -f {}" -- {}
+find examples/all/manifests -type f ! -name '*.yaml' -delete