openstack
/
barbican
Code Issues Proposed changes

Merge "Switching to use VIRTUAL_ENV env variable"

This commit is contained in:
Jenkins 2014-01-22 20:09:55 +00:00 committed by Gerrit Code Review
parent 80a89a3dd1 276c91e7e8
commit f6df3af1ce
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/barbican.sh
View File

@ -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 ];