diff --git a/.travis.yml b/.travis.yml index 0436810a..5dfc6605 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ services: 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 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 cp "shellcheck-v${SHELLCHECK_VERSION}/shellcheck" /usr/bin/ diff --git a/Makefile b/Makefile index 89df1121..cd6b2c64 100644 --- a/Makefile +++ b/Makefile @@ -165,10 +165,10 @@ clean: shellcheck: @ echo -e "Testing shell / bash scripts with shellcheck\n" - @ shellcheck --version + @ /usr/bin/shellcheck --version @ echo '' # 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" ;\ exit 1 ;\ else\