github-repos/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-27 15:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

virtualenvwrapper: fix load and detection logic

Browse Source
This commit is contained in:
Marc Cornellà 2020-05-26 18:02:46 +02:00
parent 375978fb5b
commit 68d51bd7d8
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
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 {
/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