Fixing codegen scripts 😅

`go install` install binaries either in `$GOBIN` or `$GOPATH/bin`. This means, you can do a `go install` and *hard code* `$GOPATH/bin` to find the installed binaries. As, in any case, this folder is usually in the `$PATH`, we can just rely on that. Signed-off-by: Vincent Demeester <[email protected]>
dlorenc · Apr 24, 2020 · 35d5121 · 35d5121
1 parent 468235f
commit 35d5121
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/hack/generate-groups.sh b/hack/generate-groups.sh
@@ -18,6 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+
 # generate-groups generates everything for a project with external types only, e.g. a project based
 # on CustomResourceDefinitions.
 
@@ -65,22 +66,22 @@ done
 
 if [ "${GENS}" = "all" ] || grep -qw "deepcopy" <<<"${GENS}"; then
  echo "Generating deepcopy funcs for ${GROUPS_WITH_VERSIONS}"
- "${GOPATH}/bin/deepcopy-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" -O zz_generated.deepcopy --bounding-dirs "${APIS_PKG}" "$@"
+ "deepcopy-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" -O zz_generated.deepcopy --bounding-dirs "${APIS_PKG}" "$@"
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "client" <<<"${GENS}"; then
  echo "Generating clientset for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}"
- "${GOPATH}/bin/client-gen" --clientset-name "${CLIENTSET_NAME_VERSIONED:-versioned}" --input-base "" --input "$(codegen::join , "${FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}" "$@"
+ "client-gen" --clientset-name "${CLIENTSET_NAME_VERSIONED:-versioned}" --input-base "" --input "$(codegen::join , "${FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}" "$@"
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "lister" <<<"${GENS}"; then
  echo "Generating listers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/listers"
- "${GOPATH}/bin/lister-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/listers" "$@"
+ "lister-gen" --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/listers" "$@"
 fi
 
 if [ "${GENS}" = "all" ] || grep -qw "informer" <<<"${GENS}"; then
  echo "Generating informers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/informers"
- "${GOPATH}/bin/informer-gen" \
+ "informer-gen" \
  --input-dirs "$(codegen::join , "${FQ_APIS[@]}")" \
  --versioned-clientset-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_VERSIONED:-versioned}" \
  --listers-package "${OUTPUT_PKG}/listers" \

diff --git a/hack/generate-knative.sh b/hack/generate-knative.sh
@@ -82,7 +82,7 @@ if grep -qw "injection" <<<"${GENS}"; then
  # Clear old injection
  rm -rf ${OUTPUT_PKG}
 
- ${GOPATH}/bin/injection-gen \
+ injection-gen \
  --input-dirs $(codegen::join , "${FQ_APIS[@]}") \
  --versioned-clientset-package ${VERSIONED_CLIENTSET_PKG} \
  --external-versions-informers-package ${EXTERNAL_INFORMER_PKG} \

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -41,17 +41,17 @@ bash ${REPO_ROOT_DIR}/hack/generate-groups.sh "deepcopy,client,informer,lister"
  --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
 # Depends on generate-groups.sh to install bin/deepcopy-gen
-${GOPATH}/bin/deepcopy-gen \
+deepcopy-gen \
  -O zz_generated.deepcopy \
  --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
  -i github.com/tektoncd/pipeline/pkg/apis/config
 
-${GOPATH}/bin/deepcopy-gen \
+deepcopy-gen \
  -O zz_generated.deepcopy \
  --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
 -i github.com/tektoncd/pipeline/pkg/apis/pipeline/pod
 
-${GOPATH}/bin/deepcopy-gen \
+deepcopy-gen \
  -O zz_generated.deepcopy \
  --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
 -i github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1/storage