aboutsummaryrefslogtreecommitdiffstats
path: root/dev.sh
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-05-26 08:46:02 +1200
committerAldo Cortesi <aldo@corte.si>2016-05-26 08:46:02 +1200
commitbcfce32bfaa06fbedaa754828fd7a1590ac3ca61 (patch)
tree6a04b5a69d98a6ba57572a34a89b543539f1a031 /dev.sh
parente44947e8c267bb0fe4ff07235f28a3d3da549872 (diff)
parentb0c90cc64f5090e762ba424a5f7aa57a22470d73 (diff)
downloadmitmproxy-bcfce32bfaa06fbedaa754828fd7a1590ac3ca61.tar.gz
mitmproxy-bcfce32bfaa06fbedaa754828fd7a1590ac3ca61.tar.bz2
mitmproxy-bcfce32bfaa06fbedaa754828fd7a1590ac3ca61.zip
Merge pull request #1168 from Kriechi/venv-py3
add a py3 venv in dev environment
Diffstat (limited to 'dev.sh')
-rwxr-xr-xdev.sh30
1 files changed, 23 insertions, 7 deletions
diff --git a/dev.sh b/dev.sh
index a9c27248..0d1a8d98 100755
--- a/dev.sh
+++ b/dev.sh
@@ -1,13 +1,29 @@
-#!/bin/bash
+#!/bin/sh
set -e
-VENV=./venv
+
+VENV="./venv"
+VENV3="${VENV}3"
python -m virtualenv $VENV --always-copy
. $VENV/bin/activate
-pip install -U pip setuptools
-pip install -r requirements.txt
+pip install -q -U pip setuptools
+pip install -q -r requirements.txt
echo ""
-echo "* Created virtualenv environment in $VENV."
-echo "* Installed all dependencies into the virtualenv."
-echo "* You can now activate the virtualenv: \`. $VENV/bin/activate\`"
+echo "* Virtualenv created in $VENV and all dependencies installed."
+echo "* You can now activate the $(python --version) virtualenv with this command: \`. $VENV/bin/activate\`"
+
+if $(python --version 2>&1 | grep -q "Python 2.") && command -v python3 >/dev/null 2>&1; then
+ echo ""
+ echo ""
+
+ python3 -m virtualenv "$VENV3" --always-copy
+ . "$VENV3/bin/activate"
+ pip install -q -U pip setuptools
+ pip install -q -r requirements.txt
+
+ echo ""
+ echo "* Virtualenv created in $VENV3 and all dependencies installed."
+ echo "* You can now activate the $(python --version) virtualenv with this command: \`. $VENV3/bin/activate\`"
+fi
+