From 7850f206a578b454d9178834f1c23ab0c0d4b62e Mon Sep 17 00:00:00 2001 From: James Murty Date: Thu, 15 Sep 2016 19:41:52 +1000 Subject: [PATCH] go.sh: Remove fail in existing venv & fix check for ICEKit venv path --- project_template/go.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/project_template/go.sh b/project_template/go.sh index d8c619fa..c074f84d 100755 --- a/project_template/go.sh +++ b/project_template/go.sh @@ -8,12 +8,6 @@ EOF set -e -# Detect if this script is run within an existing virtualenv and abort -if [[ $VIRTUAL_ENV ]]; then - echo "ERROR: $0 will not work properly if run inside a venv; deactivate '`basename $VIRTUAL_ENV`'" - exit 1 -fi - # Get absolute project directory from the location of this script. # See: http://stackoverflow.com/a/4774063 export ICEKIT_PROJECT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd -P) @@ -21,7 +15,7 @@ export ICEKIT_PROJECT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd -P) export ICEKIT_VENV="$ICEKIT_PROJECT_DIR/var/venv-icekit-dev" # Create local (non-Docker) virtualenv. -if [[ ! -d "$ICEKIT_VENV/bin/pip" ]]; then +if [[ ! -d "$ICEKIT_VENV" ]]; then virtualenv "$ICEKIT_VENV" fi