linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-27 03:14:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b345f29f2f into 599831b85a

Browse source
This commit is contained in:
Sandy Rogers 2015-06-17 21:13:52 +00:00
commit bdd6835b76
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file

@ -36,6 +36,10 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
function workon_cwd { function workon_cwd {
if [ ! $WORKON_CWD ]; then if [ ! $WORKON_CWD ]; then
WORKON_CWD=1 WORKON_CWD=1
# Check whether realpath is installed (it isn't on a mac...)
if type "$realpath" > /dev/null; then
# If we have realpath, can auto switch virtualenv based on git name
# Check if this is a Git repo # Check if this is a Git repo
PROJECT_ROOT=`pwd` PROJECT_ROOT=`pwd`
while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
@ -44,6 +48,13 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
if [[ "$PROJECT_ROOT" == "/" ]]; then if [[ "$PROJECT_ROOT" == "/" ]]; then
PROJECT_ROOT="." PROJECT_ROOT="."
fi fi
else
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
if (( $? != 0 )); then
PROJECT_ROOT="."
fi
fi
# Check for virtualenv name override # Check for virtualenv name override
if [[ -f "$PROJECT_ROOT/.venv" ]]; then if [[ -f "$PROJECT_ROOT/.venv" ]]; then
ENV_NAME=`cat "$PROJECT_ROOT/.venv"` ENV_NAME=`cat "$PROJECT_ROOT/.venv"`