Commit 68d51bd7 authored by Marc Cornellà's avatar Marc Cornellà
Browse files

virtualenvwrapper: fix load and detection logic

parent 375978fb
function { function {
# search in these locations for the init script: # search in these locations for the init script:
for f in $commands[virtualenvwrapper_lazy.sh] \ for virtualenvwrapper in $commands[virtualenvwrapper_lazy.sh] \
$commands[virtualenvwrapper.sh] \ $commands[virtualenvwrapper.sh] \
/usr/share/virtualenvwrapper/virtualenvwrapper{_lazy,}.sh \ /usr/share/virtualenvwrapper/virtualenvwrapper{_lazy,}.sh \
/usr/local/bin/virtualenvwrapper{_lazy,}.sh \ /usr/local/bin/virtualenvwrapper{_lazy,}.sh \
...@@ -8,16 +8,17 @@ function { ...@@ -8,16 +8,17 @@ function {
/usr/share/bash-completion/completions/virtualenvwrapper \ /usr/share/bash-completion/completions/virtualenvwrapper \
$HOME/.local/bin/virtualenvwrapper.sh $HOME/.local/bin/virtualenvwrapper.sh
do do
if [[ -f $f ]]; then if [[ -f "$virtualenvwrapper" ]]; then
source $f source "$virtualenvwrapper"
return return
fi fi
done done
print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh.\n"\ print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh.\n"\
"Please install with \`pip install virtualenvwrapper\`" >&2 "Please install with \`pip install virtualenvwrapper\`" >&2
return 1
} }
if ! type workon &>/dev/null; then if [[ $? -eq 0 ]] && ! type workon &>/dev/null; then
print "[oh-my-zsh] virtualenvwrapper plugin: shell function 'workon' not defined.\n"\ print "[oh-my-zsh] virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
"Please check ${virtualenvwrapper}" >&2 "Please check ${virtualenvwrapper}" >&2
return return
......
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