From 3c30074a7f3bc5ea5265dd76a6aa5577c1a63825 Mon Sep 17 00:00:00 2001 From: Jack Ivanov <17044561+jackivanov@users.noreply.github.com> Date: Thu, 22 Aug 2019 12:54:05 +0200 Subject: [PATCH] Revert "More robust use of our virtualenv (#1412)" (#1559) This reverts commit 290910755465175a3c5dc177afb402a2ca5bd915. --- algo | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/algo b/algo index 0ff3f0a..260c0e6 100755 --- a/algo +++ b/algo @@ -2,17 +2,19 @@ set -e -ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate" -if [ -f "$ACTIVATE_SCRIPT" ] +if [ -z ${VIRTUAL_ENV+x} ] then + ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate" + if [ -f "$ACTIVATE_SCRIPT" ] + then # shellcheck source=/dev/null source "$ACTIVATE_SCRIPT" -else + else echo "$ACTIVATE_SCRIPT not found. Did you follow documentation to install dependencies?" exit 1 + fi fi - case "$1" in update-users) PLAYBOOK=users.yml; ARGS=( "${@:2}" -t update-users ) ;; *) PLAYBOOK=main.yml; ARGS=( "${@}" ) ;;