From 951fe2f7ed3f34d34b88d65fd21ca18384bc3f74 Mon Sep 17 00:00:00 2001
From: Jim Shaver <dcypherd@gmail.com>
Date: Tue, 23 Jun 2015 20:17:57 -0500
Subject: [PATCH 1/3] Add a check to see if virtualenv is installed.

---
 dev     | 4 ++--
 dev.bat | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev b/dev
index 9f66cbafc..f9fcb95e6 100755
--- a/dev
+++ b/dev
@@ -1,11 +1,11 @@
 #!/bin/sh
 VENV=../venv.mitmproxy
 
-virtualenv $VENV
+virtualenv $VENV || { echo 'virtualenv is not installed. Exiting.' ; exit 1; }
 source $VENV/bin/activate
 pip install --src .. -r requirements.txt
 
 echo ""
 echo "* Created virtualenv environment in $VENV."
 echo "* Installed all dependencies into the virtualenv."
-echo "* Activated virtualenv environment."
\ No newline at end of file
+echo "* Activated virtualenv environment."
diff --git a/dev.bat b/dev.bat
index 303c804e1..82bdd0d4a 100644
--- a/dev.bat
+++ b/dev.bat
@@ -1,11 +1,11 @@
 @echo off
 set VENV=..\venv.mitmproxy
 
-virtualenv %VENV%
+virtualenv %VENV% || echo virtualenv is not installed.  Exiting.
 call %VENV%\Scripts\activate.bat
 pip install --src .. -r requirements.txt
 
 echo.
 echo * Created virtualenv environment in %VENV%.
 echo * Installed all dependencies into the virtualenv.
-echo * Activated virtualenv environment.
\ No newline at end of file
+echo * Activated virtualenv environment.

From 854dc004ee95eef6ef3ea4ac8489a57b8ee5a070 Mon Sep 17 00:00:00 2001
From: Jim Shaver <dcypherd@gmail.com>
Date: Tue, 23 Jun 2015 20:47:36 -0500
Subject: [PATCH 2/3] revert change, already done on master.

---
 dev.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev.bat b/dev.bat
index 82bdd0d4a..cf4882bab 100644
--- a/dev.bat
+++ b/dev.bat
@@ -1,7 +1,7 @@
 @echo off
 set VENV=..\venv.mitmproxy
 
-virtualenv %VENV% || echo virtualenv is not installed.  Exiting.
+virtualenv %VENV%
 call %VENV%\Scripts\activate.bat
 pip install --src .. -r requirements.txt
 

From db5c0b210b0133d7cd58124c727dbc24480e2568 Mon Sep 17 00:00:00 2001
From: Jim Shaver <dcypherd@gmail.com>
Date: Tue, 23 Jun 2015 20:50:51 -0500
Subject: [PATCH 3/3] merged with upstream changes in dev

---
 dev | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev b/dev
index f9fcb95e6..153aafd05 100755
--- a/dev
+++ b/dev
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
+set -e
 VENV=../venv.mitmproxy
 
-virtualenv $VENV || { echo 'virtualenv is not installed. Exiting.' ; exit 1; }
+python -m virtualenv $VENV || { echo 'virtualenv is not installed. Exiting.' ; exit 1; }
 source $VENV/bin/activate
 pip install --src .. -r requirements.txt