mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-03-13 03:12:21 +01:00
Merge 9aa71aaf20 into c63f27a9f2
This commit is contained in:
commit
f34b34c086
1 changed files with 57 additions and 48 deletions
|
|
@ -1,7 +1,16 @@
|
||||||
virtualenvwrapper='virtualenvwrapper.sh'
|
virtualenvwrapper='virtualenvwrapper.sh'
|
||||||
|
|
||||||
if (( $+commands[$virtualenvwrapper] )); then
|
if (( $+commands[$virtualenvwrapper] )); then
|
||||||
source ${${virtualenvwrapper}:c}
|
source ${${virtualenvwrapper}:c}
|
||||||
|
elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
|
||||||
|
virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
|
||||||
|
source "/etc/bash_completion.d/virtualenvwrapper"
|
||||||
|
else
|
||||||
|
print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`."
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if type workon 2>&1 >/dev/null; then
|
||||||
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
|
||||||
|
|
@ -55,5 +64,5 @@ if (( $+commands[$virtualenvwrapper] )); then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`."
|
print "zsh virtualenvwrapper plugin: shell function 'workon' not defined. Please check ${virtualenvwrapper}." >&2
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue