using exact shellcheck location now for correct version (not using Travis')

using
This commit is contained in:
Georg Lauterbach 2020-09-08 20:22:27 +02:00
parent 4096c782cf
commit 34e8a76300
No known key found for this signature in database
GPG key ID: 386D76E7AD496709
2 changed files with 2 additions and 3 deletions

View file

@ -22,7 +22,6 @@ services:
before_install: before_install:
- sudo curl -L https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-$(uname -s)-$(uname -m) -o /usr/local/bin/hadolint - sudo curl -L https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-$(uname -s)-$(uname -m) -o /usr/local/bin/hadolint
- sudo chmod +rx /usr/local/bin/hadolint - sudo chmod +rx /usr/local/bin/hadolint
- sudo apt-get -y remove shellcheck
- sudo wget -qO- "https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar -xJv - sudo wget -qO- "https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar -xJv
- sudo cp "shellcheck-v${SHELLCHECK_VERSION}/shellcheck" /usr/bin/ - sudo cp "shellcheck-v${SHELLCHECK_VERSION}/shellcheck" /usr/bin/

View file

@ -165,10 +165,10 @@ clean:
shellcheck: shellcheck:
@ echo -e "Testing shell / bash scripts with shellcheck\n" @ echo -e "Testing shell / bash scripts with shellcheck\n"
@ shellcheck --version @ /usr/bin/shellcheck --version
@ echo '' @ echo ''
# currently without `start-mailserver` as this is to be merged separately # currently without `start-mailserver` as this is to be merged separately
@ if find -iname "*.sh" -not -path "./test/*" -not -path "./target/docker-configomat/*" -not -wholename ./target/start-mailserver.sh -exec shellcheck -S style -Cauto -o all -e SC2250,SC2154 -W 50 {} \; | grep .; then\ @ if find -iname "*.sh" -not -path "./test/*" -not -path "./target/docker-configomat/*" -not -wholename ./target/start-mailserver.sh -exec /usr/bin/shellcheck -S style -Cauto -o all -e SC2250,SC2154 -W 50 {} \; | grep .; then\
echo -e "\nError" ;\ echo -e "\nError" ;\
exit 1 ;\ exit 1 ;\
else\ else\