Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
470e1a1e
Commit
470e1a1e
authored
Jun 22, 2012
by
Robby Russell
Browse files
Merge pull request #1173 from walkah/virtualenvwrapper-osx-fix
Readlink is different on OS X
parents
17c77ee2
82f785bc
Changes
1
Hide whitespace changes
Inline
Side-by-side
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file @
470e1a1e
...
@@ -10,11 +10,9 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
...
@@ -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/
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment