From 89b30a914689c1dab50b6b0678d53976dd53bf19 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Sat, 3 Jun 2017 17:45:05 +0200
Subject: [PATCH] Force bare env execution on travis

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 .travis.yml    |  4 ++--
 check-style.sh | 12 +++++++++---
 test-local.sh  |  9 +++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55d05ed..d1f6482 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ install:
   - ./install.sh system-dev
 
 script:
-  - ./check-style.sh
-  - ./test-local.sh
+  - ./check-style.sh bare
+  - ./test-local.sh bare
   # - ./test-docker.sh
 
 after_success:
diff --git a/check-style.sh b/check-style.sh
index b9f51d4..f195506 100755
--- a/check-style.sh
+++ b/check-style.sh
@@ -4,7 +4,13 @@ set -e
 
 cd $(dirname $0)
 
-pipenv run python setup.py sdist
-pipenv run python setup.py flake8
+PIPENV_EXEC="pipenv run "
+
+if [[ $1 == "bare" ]]; then
+    PIPENV_EXEC=""
+fi
+
+${PIPENV_EXEC}python setup.py sdist
+${PIPENV_EXEC}python setup.py flake8
 echo "Running pylint"
-pipenv run pylint --rcfile=setup.cfg subdlsrv
+${PIPENV_EXEC}pylint --rcfile=setup.cfg subdlsrv
diff --git a/test-local.sh b/test-local.sh
index a0ed687..6c8c085 100755
--- a/test-local.sh
+++ b/test-local.sh
@@ -5,5 +5,10 @@ set -e
 cd $(dirname $0)
 
 echo "Test local build"
-pipenv run python setup.py sdist
-pipenv run pytest subdlsrv
+
+if [[ $1 == "bare" ]]; then
+    PIPENV_EXEC=""
+fi
+
+${PIPENV_EXEC}python setup.py sdist
+${PIPENV_EXEC}pytest subdlsrv