From 66b326a07739b2d62841a5c3ffd9a9d3af401f93 Mon Sep 17 00:00:00 2001
From: sobolevn <mail@sobolevn.me>
Date: Thu, 30 Jun 2016 23:04:27 +0300
Subject: [PATCH] travis final fix

---
 .ci/before_script.sh | 8 +++++---
 .ci/script.sh        | 4 ++--
 .travis.yml          | 8 +-------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.ci/before_script.sh b/.ci/before_script.sh
index fe7f22b1..9f2cc04c 100644
--- a/.ci/before_script.sh
+++ b/.ci/before_script.sh
@@ -18,10 +18,12 @@ fi
 
 # Local linux (standart build):
 if [[ "$GITSECRET_DIST" == "none" ]]; then
-  sudo apt-get update
+  if [[ "$GITSECRET_LINT" == 'lint' ]]; then
+    sudo apt-get update
 
-  # Installing linter:
-  sudo apt-get install -y shellcheck
+    # Installing linter:
+    sudo apt-get install -y shellcheck
+  fi
 
   if [[ "$GITSECRET_GPG_DEP" == "gnupg2" ]]; then
     # Installing custom GPG version:
diff --git a/.ci/script.sh b/.ci/script.sh
index 7d201e03..ed3dea44 100644
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -21,7 +21,7 @@ if [[ -z "$DOCKER_DIST" ]]; then
   make test
 fi
 
-if [[ "$GITSECRET_DIST" == 'none' ]]; then
-  # If running a native build, do a lint:
+if [[ "$GITSECRET_LINT" == 'lint' ]]; then
+  # 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 3a2316ea..1d893a1e 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"
+      env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg"; GITSECRET_LINT="lint"
       sudo: required
       language: ruby
       addons:
@@ -30,12 +30,6 @@ matrix:
       env: GITSECRET_DIST="none"; GITSECRET_GPG_DEP="gnupg2"; SECRETS_GPG_COMMAND="gpg2"
       sudo: required
       language: ruby
-      addons:
-        apt:
-          sources:
-          - debian-sid
-          packages:
-          - shellcheck
     - os: osx
       env: GITSECRET_DIST="brew"; GITSECRET_GPG_DEP="gnupg"; SECRETS_GPG_COMMAND="gpg"
       sudo: false