summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-01-15 16:46:51 +0100
committermathieui <mathieui@mathieui.net>2015-01-15 16:47:29 +0100
commit0efdcd12e24586453dfd3f5395b950699bd1d846 (patch)
tree3d52982f4e9fdf2279dc1c79ab66a7aa10c086c6
parenta4771623a509b8f87e137169897d4347cb44fa70 (diff)
downloadpoezio-0efdcd12e24586453dfd3f5395b950699bd1d846.tar.gz
poezio-0efdcd12e24586453dfd3f5395b950699bd1d846.tar.bz2
poezio-0efdcd12e24586453dfd3f5395b950699bd1d846.tar.xz
poezio-0efdcd12e24586453dfd3f5395b950699bd1d846.zip
Make use of the $POEZIO_VENV and $POEZIO_VENV_COMMAND env variables if they exist
(instead of having the user edit the scripts to tailor it to their needs)
-rwxr-xr-xlaunch.sh9
-rwxr-xr-xupdate.sh25
2 files changed, 22 insertions, 12 deletions
diff --git a/launch.sh b/launch.sh
index fcbfa5d9..ca100524 100755
--- a/launch.sh
+++ b/launch.sh
@@ -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"
diff --git a/update.sh b/update.sh
index 434f789c..dfaadd00 100755
--- a/update.sh
+++ b/update.sh
@@ -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'