From f0ed2c84c93d361e9a82b4017a1074a40e684b09 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 26 Jul 2010 18:57:24 -0700
Subject: [PATCH] Fixes to the virtualenv installer

---
 Makefile               | 2 +-
 tools/activate_venv.sh | 1 +
 tools/install_venv.py  | 3 +--
 tools/with_venv.sh     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5fb51261..fa11cf33 100644
--- a/Makefile
+++ b/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)
diff --git a/tools/activate_venv.sh b/tools/activate_venv.sh
index d12cb349..376db5b9 100644
--- a/tools/activate_venv.sh
+++ b/tools/activate_venv.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 _TOOLS=`dirname $0`
 _VENV=$_TOOLS/../.nova-venv
 source $_VENV/bin/activate
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 720dcc0d..c35af434 100644
--- a/tools/install_venv.py
+++ b/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
 
diff --git a/tools/with_venv.sh b/tools/with_venv.sh
index 51468a33..99d1ac18 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 TOOLS=`dirname $0`
 VENV=$TOOLS/../.nova-venv
 source $VENV/bin/activate && $@