diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-06 07:09:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 07:09:00 +0000 |
| commit | 49df3cc5cb7e6a1d9e28cacfa86562abbdf48fd9 (patch) | |
| tree | f5f680eece9aeb58bc7f6c3a0daf4a80f1abf6c6 | |
| parent | 53ea7c04ef3d7fac035a004605eaa1c0edd95f3c (diff) | |
| parent | 791dbf8232ebea6bb98a62873e2e66310bc2f73d (diff) | |
| download | podman-49df3cc5cb7e6a1d9e28cacfa86562abbdf48fd9.tar.gz podman-49df3cc5cb7e6a1d9e28cacfa86562abbdf48fd9.tar.bz2 podman-49df3cc5cb7e6a1d9e28cacfa86562abbdf48fd9.zip | |
Merge pull request #14835 from edsantiago/fix_golangci_install
golangci install: explicitly set BINDIR
| -rwxr-xr-x | hack/install_golangci.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hack/install_golangci.sh b/hack/install_golangci.sh index 4ef6bc83b..896d59901 100755 --- a/hack/install_golangci.sh +++ b/hack/install_golangci.sh @@ -9,14 +9,17 @@ function install() { curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v$VERSION } -BIN="./bin/golangci-lint" +# Undocumented behavior: golangci-lint installer requires $BINDIR in env, +# will default to ./bin but we can't rely on that. +export BINDIR="./bin" +BIN="$BINDIR/golangci-lint" if [ ! -x "$BIN" ]; then install else # Prints its own file name as part of --version output $BIN --version | grep "$VERSION" if [ $? -eq 0 ]; then - echo "Using existing $(dirname $BIN)/$($BIN --version)" + echo "Using existing $BINDIR/$($BIN --version)" else install fi |