From 276c91e7e8dfd584bfcae18bbca85fa58cd257f8 Mon Sep 17 00:00:00 2001
From: John Vrbanac <john.vrbanac@rackspace.com>
Date: Sun, 12 Jan 2014 20:46:01 -0600
Subject: [PATCH] Switching to use VIRTUAL_ENV env variable

Attempts to use VIRTUAL_ENV by default. If it's not available then
the script attempts to use pyenv's prefix to retrieve the python
environment path.

Change-Id: I45597a8736ca70ae935da59b24eac4e5ff7d6091
---
 bin/barbican.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/barbican.sh b/bin/barbican.sh
index 8350d03d7..e1ca94c8d 100755
--- a/bin/barbican.sh
+++ b/bin/barbican.sh
@@ -2,7 +2,10 @@
 
 CONFIG_DIR=/etc/barbican
 DB_DIR=/var/lib/barbican
-VENV_DIR=${BARBICAN_VENV:-~/.pyenv/versions/$PYENV_VERSION}
+
+# VIRTUAL_ENV is set by virtualenv on activate. If VIRTUAL_ENV is not,
+# available, it attempts to fallback on pyenv for the python environment path.
+VENV_DIR=${VIRTUAL_ENV:-`pyenv prefix`}
 
 LOCAL_CONFIG_DIR=./etc/barbican
 if [ ! -d $LOCAL_CONFIG_DIR ];