Skip to content

Commit 45af3c6

Browse files
committed
Fix shellcheck multi-arch setup
Signed-off-by: Thomas Stromberg <[email protected]>
1 parent f815672 commit 45af3c6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# http://github.com/tinkerbell/lint-install
44

55
{{ if .Go }}GOLINT_VERSION ?= v1.42.0{{ end }}
6-
{{- if .Dockerfile}}HADOLINT_VERSION ?= v2.7.0{{ end }}
7-
{{- if .Shell}}SHELLCHECK_VERSION ?= v0.7.2{{ end }}
6+
{{ if .Dockerfile}}HADOLINT_VERSION ?= v2.7.0{{ end }}
7+
{{ if .Shell}}SHELLCHECK_VERSION ?= v0.7.2{{ end }}
88
LINT_OS := $(shell uname)
99
LINT_ARCH := $(shell uname -m)
1010

@@ -25,8 +25,8 @@ lint: {{ if .Shell }}out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/s
2525
{{ if .Shell -}}
2626
out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck:
2727
mkdir -p out/linters
28-
curl -sSfL https://github.com/koalaman/shellcheck/releases/download/v0.7.2/shellcheck-$(SHELLCHECK_VERSION).$(LINT_LOWER_OS).$(LINT_ARCH).tar.xz | tar -C out/linters -xJf -
29-
mv shellcheck-$(SHELLCHECK_VERSION) shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
28+
curl -sSfL https://github.com/koalaman/shellcheck/releases/download/$(SHELLCHECK_VERSION)/shellcheck-$(SHELLCHECK_VERSION).$(LINT_LOWER_OS).$(LINT_ARCH).tar.xz | tar -C out/linters -xJf -
29+
mv out/linters/shellcheck-$(SHELLCHECK_VERSION) out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
3030

3131
{{ end -}}
3232
{{ if .Dockerfile -}}

0 commit comments

Comments
 (0)