dolysis
/
ohmyzsh
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #1173 from walkah/virtualenvwrapper-osx-fix 

Readlink is different on OS X
This commit is contained in:
Robby Russell 2012-06-22 06:35:49 -07:00
parent 17c77ee20a 82f785bc67
commit 470e1a1ecf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,11 +10,9 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
# by placing a .venv file in the project root with a virtualenv name in it # by placing a .venv file in the project root with a virtualenv name in it
function workon_cwd { function workon_cwd {
# Check that this is a Git repo # Check that this is a Git repo
GIT_DIR=`git rev-parse --git-dir 2> /dev/null` PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
if (( $? == 0 )); then if (( $? == 0 )); then
# Find the repo root and check for virtualenv name override # Check for virtualenv name override
GIT_DIR=`readlink -f $GIT_DIR`
PROJECT_ROOT=`dirname "$GIT_DIR"`
ENV_NAME=`basename "$PROJECT_ROOT"` ENV_NAME=`basename "$PROJECT_ROOT"`
if [[ -f "$PROJECT_ROOT/.venv" ]]; then if [[ -f "$PROJECT_ROOT/.venv" ]]; then
ENV_NAME=`cat "$PROJECT_ROOT/.venv"` ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
@ -30,6 +28,7 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
# Note: this only happens if the virtualenv was activated automatically # Note: this only happens if the virtualenv was activated automatically
deactivate && unset CD_VIRTUAL_ENV deactivate && unset CD_VIRTUAL_ENV
fi fi
unset PROJECT_ROOT
} }
# New cd function that does the virtualenv magic # New cd function that does the virtualenv magic