From a8b64af7f904d0fbb5ed11de0556235d55c2e576 Mon Sep 17 00:00:00 2001 From: Matt Behrens Date: Mon, 23 Apr 2018 19:03:24 -0400 Subject: [PATCH] skip virtualenv check if already activated (#863) This allows the user to choose their virtualenv method, e.g. [Pipenv](https://docs.pipenv.org/). --- algo | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/algo b/algo index 403608a81..b451de37a 100755 --- a/algo +++ b/algo @@ -2,13 +2,16 @@ set -e -ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate" -if [ -f "$ACTIVATE_SCRIPT" ] +if [ -z ${VIRTUAL_ENV+x} ] then - source $ACTIVATE_SCRIPT -else - echo "$ACTIVATE_SCRIPT not found. Did you follow documentation to install dependencies?" - exit 1 + ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate" + if [ -f "$ACTIVATE_SCRIPT" ] + then + source $ACTIVATE_SCRIPT + else + echo "$ACTIVATE_SCRIPT not found. Did you follow documentation to install dependencies?" + exit 1 + fi fi SKIP_TAGS="_null encrypted"