diff --git a/.ci/before_script.sh b/.ci/before_script.sh index 9f2cc04c..acdb3aa2 100644 --- a/.ci/before_script.sh +++ b/.ci/before_script.sh @@ -18,13 +18,6 @@ fi # Local linux (standart build): if [[ "$GITSECRET_DIST" == "none" ]]; then - if [[ "$GITSECRET_LINT" == 'lint' ]]; then - sudo apt-get update - - # Installing linter: - sudo apt-get install -y shellcheck - fi - if [[ "$GITSECRET_GPG_DEP" == "gnupg2" ]]; then # Installing custom GPG version: sudo apt-get install -y gnupg2 diff --git a/.ci/script.sh b/.ci/script.sh index ed3dea44..58df35a1 100644 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -21,7 +21,8 @@ if [[ -z "$DOCKER_DIST" ]]; then make test fi -if [[ "$GITSECRET_LINT" == 'lint' ]]; then +if [[ $(command -v shellcheck; echo $?) -eq 0 ]]; then + echo 'running lint' # If running a native build with lint param, do a lint: find src -type f -name '*.sh' -print0 | xargs -0 -I {} shellcheck {} fi diff --git a/.travis.yml b/.travis.yml index 1d893a1e..e7298030 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: sudo: required language: ruby - os: linux - env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg"; GITSECRET_LINT="lint" + env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg" sudo: required language: ruby addons: