Fixes to the virtualenv installer

Makefile

@@ -15,7 +15,7 @@ clean:
 	rm -rf keys
 	rm -rf instances
 	rm -rf networks
-	rm run_tests.err.log
+	rm -f run_tests.err.log
 
 clean-all: clean
 	rm -rf $(venv)

tools/activate_venv.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 _TOOLS=`dirname $0`
 _VENV=$_TOOLS/../.nova-venv
 source $_VENV/bin/activate

tools/install_venv.py

@@ -5,7 +5,6 @@ Installation script for Nova's development virtualenv
 import os
 import subprocess
 import sys
-import textwrap
 
 
 ROOT = os.path.dirname(os.path.dirname(__file__))
@@ -80,7 +79,7 @@ def print_help():
 
  $ tools/with_venv.sh <your command>
 
- Also, run_tests.sh will automatically use the virtualenv.
+ Also, make test will automatically use the virtualenv.
   """
   print help
 

tools/with_venv.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 TOOLS=`dirname $0`
 VENV=$TOOLS/../.nova-venv
 source $VENV/bin/activate && $@