run.sh: improve run.sh to run in an already activated virtualenv

run.sh

@@ -3,9 +3,11 @@ PROJECT=compte-agglo-montpellier
 CTL=${PROJECT}
 VENV=${PROJECT}-venv
 
-if [ ! -d $VENV ]; then
-	./start.sh
-else
+if [ ! -n "$VIRTUAL_ENV" ]; then
+	if [ ! -d $VENV ]; then
+	./start.sh norun
+	fi
 	. ./$VENV/bin/activate
-	./$CTL "${@:-runserver}"
 fi
+./$CTL "${@:-runserver}"
+

start.sh

@@ -20,4 +20,6 @@ if [ ! -f $PROJECT.db ]; then
 	./$CTL migrate --fake
 	./load-base-data.sh
 fi
-./$CTL runserver
+if [ "$1" != "norun" ]; then
+	./$CTL runserver
+fi