diff --git a/install_virtualenv.sh b/install_virtualenv.sh index bde03b7b..f20cb93f 100755 --- a/install_virtualenv.sh +++ b/install_virtualenv.sh @@ -15,9 +15,9 @@ if [ -z "$VIRTUAL_ENV" ]; then echo export AIL_FLASK=$(pwd)/var/www/ >> ./AILENV/bin/activate echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate echo export AIL_ARDB=$(pwd)/ardb/src/ >> ./AILENV/bin/activate -fi -. ./AILENV/bin/activate + . ./AILENV/bin/activate +fi pip3 install -U pip pip3 install 'git+https://github.com/D4-project/BGP-Ranking.git/@7e698f87366e6f99b4d0d11852737db28e3ddc62#egg=pybgpranking&subdirectory=client' diff --git a/installing_deps.sh b/installing_deps.sh index 28de889e..dfa8558e 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -89,7 +89,9 @@ fi ./install_virtualenv.sh # force virtualenv activation -. ./AILENV/bin/activate +if [ -z "$VIRTUAL_ENV" ]; then + . ./AILENV/bin/activate +fi pushd ${AIL_BIN}/helper/gen_cert ./gen_root.sh