Merge branch 'fix-venv' into 'master'

fix virtualenv setup

Closes #39

See merge request !24

README.md

@@ -2,7 +2,9 @@
 
 To run locally (for testing purposes):
 
-- Install proxychains, configure it for Tor
+- Install virtualenv and Python 2.7
+
+- (Optional) Install proxychains, configure it for Tor
 
 - Pull in the dependencies:
 
@@ -21,9 +23,13 @@ To run locally (for testing purposes):
 - Start the webserver:
 
     ```
+    $ source env/bin/activate # activates virtualenv
     $ ./runserver.py
+    $ deactivate # ..s virtualenv
     ```
 
+    (if the shell in use is not bash, you can append its name to the activator if supported: `...ivate.fish`)
+
 - Open the site at http://localhost:5000/
 
 ## Running a mirror

etc/project.vars

 export venv_dir="env"
-export venv="`which virtualenv-2.7 || which virtualenv`"
+export spec=""
+export venv="`which virtualenv-2.7`"
+if [ x"$venv" = x ]; then
+	export venv="`which virtualenv`"
+	export spec="-p 2.7"
+fi

setup_venv.sh

@@ -7,7 +7,7 @@ if [ ! $venv ]; then
     exit 1
 else
     if [ ! -d $venv_dir ] ; then
-        $venv --distribute $venv_dir
+        $venv $spec $venv_dir
     fi
 
     . $venv_dir/bin/activate