diff options
| -rwxr-xr-x | launch.sh | 9 | ||||
| -rwxr-xr-x | update.sh | 25 |
2 files changed, 22 insertions, 12 deletions
@@ -1,6 +1,9 @@ #!/bin/sh poezio_dir=$(dirname "$0") -VENV="poezio-venv" +if [ -z "$POEZIO_VENV" ] +then + POEZIO_VENV="poezio-venv" +fi if [ -d "$poezio_dir/.git" ] then @@ -9,9 +12,9 @@ else args="0.9-dev" fi -if [ -e "$poezio_dir/$VENV" ] +if [ -e "$poezio_dir/$POEZIO_VENV" ] then - PYTHON3="$poezio_dir/$VENV/bin/python3" + PYTHON3="$poezio_dir/$POEZIO_VENV/bin/python3" else echo "" echo "WARNING: Not using the up-to-date launch format" @@ -7,8 +7,15 @@ # Use launch.sh to start poezio directly from here cd "$(dirname "$0")" -VENV="poezio-venv" -VENV_COMMAND="pyvenv" +if [ -z "$POEZIO_VENV" ] +then + POEZIO_VENV="poezio-venv" +fi + +if [ -z "$POEZIO_VENV_COMMAND" ] +then + POEZIO_VENV_COMMAND="pyvenv" +fi echo 'Updating poezio' git pull origin master || { @@ -16,24 +23,24 @@ git pull origin master || { exit 1 } -if [ -e "$VENV" ] +if [ -e "$POEZIO_VENV" ] then # In case of a python version upgrade echo 'Trying to upgrade the virtualenv' - $VENV_COMMAND --upgrade "$VENV" + $POEZIO_VENV_COMMAND --upgrade "$POEZIO_VENV" - . "$VENV/bin/activate" + . "$POEZIO_VENV/bin/activate" python3 -c 'import sys;(print("Python 3.4 or newer is required") and exit(1)) if sys.version_info < (3, 4) else exit(0)' || exit 1 echo 'Updating the poezio dependencies' pip install -r requirements.txt --upgrade echo 'Updating the poezio plugin dependencies' pip install -r requirements-plugins.txt --upgrade else - echo "Creating the $VENV virtualenv" - $VENV_COMMAND "$VENV" + echo "Creating the $POEZIO_VENV virtualenv" + $POEZIO_VENV_COMMAND "$POEZIO_VENV" - . "$VENV/bin/activate" - cd "$VENV" # needed to download slixmpp inside the venv + . "$POEZIO_VENV/bin/activate" + cd "$POEZIO_VENV" # needed to download slixmpp inside the venv python3 -c 'import sys;(print("Python 3.4 or newer is required") and exit(1)) if sys.version_info < (3, 4) else exit(0)' || exit 1 echo 'Installing the poezio dependencies using pip' |