From 146549a66a9c2257617591a3613284e8637fcb3d Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 3 Apr 2019 16:20:26 +0200 Subject: [PATCH] keep complexhttpserver installation within riot folder and gitignore leftovers --- .gitignore | 1 + riot/install.sh | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 24cd046858..afca1ddcb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules *.png +riot/env diff --git a/riot/install.sh b/riot/install.sh index 9422bd225a..59f945d51b 100755 --- a/riot/install.sh +++ b/riot/install.sh @@ -8,23 +8,24 @@ if [ -d $BASE_DIR/riot-web ]; then exit fi +cd $BASE_DIR # Install ComplexHttpServer (a drop in replacement for Python's SimpleHttpServer # but with support for multiple threads) into a virtualenv. ( - virtualenv $BASE_DIR/env - source $BASE_DIR/env/bin/activate + virtualenv env + source env/bin/activate # Having been bitten by pip SSL fail too many times, I don't trust the existing pip # to be able to --upgrade itself, so grab a new one fresh from source. curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py python get-pip.py + rm get-pip.py pip install ComplexHttpServer deactivate ) -cd $BASE_DIR curl -L https://github.com/vector-im/riot-web/archive/${RIOT_BRANCH}.zip --output riot.zip unzip -q riot.zip rm riot.zip