diff --git a/install_virtualenv.sh b/install_virtualenv.sh index 9c80b08c..bde03b7b 100755 --- a/install_virtualenv.sh +++ b/install_virtualenv.sh @@ -15,11 +15,10 @@ 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 - - . ./AILENV/bin/activate - fi +. ./AILENV/bin/activate + pip3 install -U pip pip3 install 'git+https://github.com/D4-project/BGP-Ranking.git/@7e698f87366e6f99b4d0d11852737db28e3ddc62#egg=pybgpranking&subdirectory=client' pip3 install -U -r requirements.txt diff --git a/installing_deps.sh b/installing_deps.sh index 49e7cb2e..28de889e 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -88,16 +88,18 @@ fi # create AILENV + intall python packages ./install_virtualenv.sh +# force virtualenv activation +. ./AILENV/bin/activate -pushd ${AIL_BIN}helper/gen_cert +pushd ${AIL_BIN}/helper/gen_cert ./gen_root.sh wait ./gen_cert.sh wait popd -cp ${AIL_BIN}helper/gen_cert/server.crt ${AIL_FLASK}server.crt -cp ${AIL_BIN}helper/gen_cert/server.key ${AIL_FLASK}server.key +cp ${AIL_BIN}/helper/gen_cert/server.crt ${AIL_FLASK}/server.crt +cp ${AIL_BIN}/helper/gen_cert/server.key ${AIL_FLASK}/server.key mkdir -p $AIL_HOME/PASTES @@ -109,14 +111,14 @@ $AIL_HOME/doc/generate_modules_data_flow_graph.sh # init update version pushd ${AIL_HOME} # shallow clone -git fetch --tags --prune --unshallow +git fetch --tags --prune --depth=10000 git describe --abbrev=0 --tags | tr -d '\n' > ${AIL_HOME}/update/current_version echo "AIL current version:" git describe --abbrev=0 --tags popd # LAUNCH ARDB -bash ${AIL_BIN}LAUNCH.sh -lav & +bash ${AIL_BIN}/LAUNCH.sh -lav & wait echo "" @@ -125,6 +127,6 @@ pushd ${AIL_FLASK} python3 create_default_user.py popd -bash ${AIL_BIN}LAUNCH.sh -k & +bash ${AIL_BIN}/LAUNCH.sh -k & wait echo ""