mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-22 05:40:08 +00:00
virtualenvwrapper: fix load and detection logic
This commit is contained in:
parent
375978fb5b
commit
68d51bd7d8
1 changed files with 11 additions and 10 deletions
|
@ -1,23 +1,24 @@
|
||||||
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 \
|
||||||
/etc/bash_completion.d/virtualenvwrapper \
|
/etc/bash_completion.d/virtualenvwrapper \
|
||||||
/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
|
||||||
|
|
Loading…
Reference in a new issue