Commit d6edbd5e by James Tauber

Merge pull request #377 from edx/jtauber/fix-virtualenv-directory

Use $WORKON_HOME consistently for virtualenv.
parents 8b13ff3d 047da7a7
......@@ -404,14 +404,14 @@ fi
# Create edX virtualenv and link it to repo
# virtualenvwrapper automatically sources the activation script
if [[ $systempkgs ]]; then
mkvirtualenv -q -a "$HOME/.virtualenvs" --system-site-packages edx-platform || {
mkvirtualenv -q -a "$WORKON_HOME" --system-site-packages edx-platform || {
error "mkvirtualenv exited with a non-zero error"
return 1
}
else
# default behavior for virtualenv>1.7 is
# --no-site-packages
mkvirtualenv -q -a "$HOME/.virtualenvs" edx-platform || {
mkvirtualenv -q -a "$WORKON_HOME" edx-platform || {
error "mkvirtualenv exited with a non-zero error"
return 1
}
......@@ -443,7 +443,7 @@ fi
# building correct version of distribute from source
DISTRIBUTE_VER="0.6.28"
output "Building Distribute"
SITE_PACKAGES="$HOME/.virtualenvs/edx-platform/lib/python2.7/site-packages"
SITE_PACKAGES="$WORKON_HOME/edx-platform/lib/python2.7/site-packages"
cd "$SITE_PACKAGES"
curl -sSLO http://pypi.python.org/packages/source/d/distribute/distribute-${DISTRIBUTE_VER}.tar.gz
tar -xzvf distribute-${DISTRIBUTE_VER}.tar.gz
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment