Commit 09199631 by John Jarvis

adding option back for --system-site-packages, will ensure virtualenv > 1.7

parent 50dc4e80
...@@ -38,7 +38,7 @@ usage() { ...@@ -38,7 +38,7 @@ usage() {
Usage: $PROG [-c] [-v] [-h] Usage: $PROG [-c] [-v] [-h]
-c compile scipy and numpy -c compile scipy and numpy
-s do _not_ set --no-site-packages for virtualenv -s give access to global site-packages for virtualenv
-v set -x + spew -v set -x + spew
-h this -h this
...@@ -229,7 +229,7 @@ case `uname -s` in ...@@ -229,7 +229,7 @@ case `uname -s` in
} }
command -v virtualenv &>/dev/null || { command -v virtualenv &>/dev/null || {
output "Installing virtualenv" output "Installing virtualenv"
sudo pip install virtualenv virtualenvwrapper sudo pip install 'virtualenv>1.7' virtualenvwrapper
} }
command -v coffee &>/dev/null || { command -v coffee &>/dev/null || {
output "Installing coffee script" output "Installing coffee script"
...@@ -248,10 +248,12 @@ curl -sL get.rvm.io | bash -s stable ...@@ -248,10 +248,12 @@ curl -sL get.rvm.io | bash -s stable
source $RUBY_DIR/scripts/rvm source $RUBY_DIR/scripts/rvm
# skip the intro # skip the intro
LESS="-E" rvm install $RUBY_VER LESS="-E" rvm install $RUBY_VER
if [[ -n $systempkgs ]]; then if [[ $systempkgs ]]; then
virtualenv "$PYTHON_DIR" virtualenv --system-site-packages "$PYTHON_DIR"
else else
virtualenv --no-site-packages "$PYTHON_DIR" # default behavior for virtualenv>1.7 is
# --no-site-packages
virtualenv "$PYTHON_DIR"
fi fi
source $PYTHON_DIR/bin/activate source $PYTHON_DIR/bin/activate
output "Installing gem bundler" output "Installing gem bundler"
......
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