adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Organize error checking in virtualenwrapper plugin

Browse Source
This commit is contained in:
Marc Cornellà 2015-02-10 12:20:24 +01:00
parent 4161aa4f9d
commit b62911660d
1 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View File

@ -6,15 +6,22 @@ elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper" virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
source "/etc/bash_completion.d/virtualenvwrapper" source "/etc/bash_completion.d/virtualenvwrapper"
else else
print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`." print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\
"Please install with \`pip install virtualenvwrapper\`" >&2
return
fi
if ! type workon &>/dev/null; then
print "zsh virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
"Please check ${virtualenvwrapper}" >&2
return return
fi fi
if type workon 2>&1 >/dev/null; then if [[ "$WORKON_HOME" == "" ]]; then
if [[ "$WORKON_HOME" == "" ]]; then print "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" >&2
echo "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" return
else fi
if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
# Automatically activate Git projects's virtual environments based on the # Automatically activate Git projects's virtual environments based on the
# directory name of the project. Virtual environment name can be overridden # directory name of the project. Virtual environment name can be overridden
# by placing a .venv file in the project root with a virtualenv name in it # by placing a .venv file in the project root with a virtualenv name in it
@ -65,8 +72,4 @@ if type workon 2>&1 >/dev/null; then
else else
set -A chpwd_functions workon_cwd set -A chpwd_functions workon_cwd
fi fi
fi
fi
else
print "zsh virtualenvwrapper plugin: shell function 'workon' not defined. Please check ${virtualenvwrapper}." >&2
fi fi