Check the py3k version AFTER loading the virtualenv

This commit is contained in:
mathieui 2014-12-15 16:24:21 +01:00
parent 00396c158a
commit 778581c480
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3
2 changed files with 3 additions and 2 deletions

View file

@ -1,5 +1,4 @@
#!/bin/sh
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
poezio_dir=$(dirname "$0")
VENV="poezio-venv"
@ -22,5 +21,6 @@ else
PYTHON3=python3
fi
$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
exec "$PYTHON3" "$poezio_dir/src/poezio.py" -v "$args" "$@"

View file

@ -6,7 +6,6 @@
# Use launch.sh to start poezio directly from here
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
cd "$(dirname "$0")"
VENV="poezio-venv"
VENV_COMMAND="pyvenv"
@ -24,6 +23,7 @@ then
$VENV_COMMAND --upgrade "$VENV"
. "$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'
@ -34,6 +34,7 @@ else
. "$VENV/bin/activate"
cd "$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'
pip install -r "../requirements.txt"