feat: virtual env req'd by install-dev-env-scripts.sh

Author: simonsdave

CHANGELOG.md

@@ -12,7 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-* Nothing
+* ```install-dev-env-scripts.sh``` now requires virtual env
 
 ### Removed
 

bin/install-dev-env-scripts.sh

@@ -11,35 +11,41 @@ download_script() {
     CLF_VERSION=${1:-}
     SCRIPT=${2:-}
 
-    REPO_DOT_SH=$(command -v repo.sh)
-    SCRIPT_INSTALL_DIR=$(dirname "$REPO_DOT_SH")
+    DEST_SCRIPT=${VIRTUAL_ENV}/bin/${SCRIPT}
 
     curl \
        -s \
        -L \
-       -o "${SCRIPT_INSTALL_DIR}/${SCRIPT}" \
+       -o "${DEST_SCRIPT}" \
        "https://raw.githubusercontent.com/simonsdave/cloudfeaster/v${CLF_VERSION}/bin/${SCRIPT}"
 
-    chmod u+x "${SCRIPT_INSTALL_DIR}/${SCRIPT}"
+    chmod u+x "${DEST_SCRIPT}"
 
     return 0
 }
 
 set -e
-set -x
 
 if [ $# != 0 ]; then
     echo "usage: $(basename "$0")" >&2
     exit 1
 fi
 
-REPO_ROOT_DIR=$(git rev-parse --show-toplevel)
+if [ "${VIRTUAL_ENV:-}" == "" ]; then
+    echo "Virtual env not activated - could not find environment variable VIRTUAL_ENV" >&2
+    exit 2
+fi
 
+REPO_ROOT_DIR=$(git rev-parse --show-toplevel)
 CLF_VERSION=$(grep cloudfeaster== "${REPO_ROOT_DIR}/setup.py" | sed -e "s|^[[:space:]]*['\"]cloudfeaster==||g" | sed -e "s|['\"].*$||g")
 
 DEV_ENV_VERSION=$(curl -s -L "https://raw.githubusercontent.com/simonsdave/cloudfeaster/v${CLF_VERSION}/.circleci/config.yml" | grep 'image:' | tail -1 | sed -e 's|[[:space:]]*$||g' | sed -e 's|^.*dev-env:||g')
 if [ "${DEV_ENV_VERSION}" == "latest" ]; then DEV_ENV_VERSION=master; fi
-curl -s -L https://raw.githubusercontent.com/simonsdave/dev-env/${DEV_ENV_VERSION}/bin/install-dev-env.sh | bash -s -- --dev-env-version "${DEV_ENV_VERSION:-}"
+INSTALL_DEV_ENV=$(mktemp 2> /dev/null || mktemp -t DAS)
+curl -s -L https://raw.githubusercontent.com/simonsdave/dev-env/${DEV_ENV_VERSION}/bin/install-dev-env.sh -o "${INSTALL_DEV_ENV}"
+chmod a+x "${INSTALL_DEV_ENV}"
+"${INSTALL_DEV_ENV}" --dev-env-version "${DEV_ENV_VERSION:-}"
+rm "${INSTALL_DEV_ENV}"
 
 download_script "${CLF_VERSION}" "run-all-spiders.sh"
 download_script "${CLF_VERSION}" "run-spider.sh"