Merge branch 'upstream/master' into venvwrap_improvements

This commit is contained in:
Pavel Puchkin 2012-07-19 12:37:31 +11:00
commit e6a354fe65
8 changed files with 133 additions and 4 deletions

View file

@ -1,5 +1,5 @@
WRAPPER_FOUND=0
for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
if [[ -e $wrapsource ]] ; then
WRAPPER_FOUND=1
source $wrapsource