Merge pull request #1293 from cenkalti/master

Look virtualenvwrapper plugin in PATH
This commit is contained in:
Robby Russell 2012-12-02 13:03:28 -08:00
commit ef4e2aa26d

View file

@ -1,7 +1,6 @@
WRAPPER_FOUND=0 wrapsource=`which virtualenvwrapper.sh`
for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
if [[ -e $wrapsource ]] ; then if [[ -f "$wrapsource" ]]; then
WRAPPER_FOUND=1
source $wrapsource source $wrapsource
if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
@ -36,11 +35,6 @@ for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrap
builtin cd "$@" && workon_cwd builtin cd "$@" && workon_cwd
} }
fi fi
else
break print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh. Please install with \`pip install virtualenvwrapper\`."
fi
done
if [ $WRAPPER_FOUND -eq 0 ] ; then
print "zsh virtualenvwrapper plugin: Couldn't activate virtualenvwrapper. Please run \`pip install virtualenvwrapper\`."
fi fi