Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
69116fa8
Commit
69116fa8
authored
May 21, 2013
by
Germán M. Bravo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed recursion. Git not needed for it to work.
Avoid infinite `cd` loops under certain conditions. Try getting `.venv` from the current directory (not necessarily always using git)
parent
27c6becf
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
3 deletions
+13
-3
virtualenvwrapper.plugin.zsh
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+13
-3
No files found.
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file @
69116fa8
...
@@ -8,14 +8,22 @@ if [[ -f "$wrapsource" ]]; then
...
@@ -8,14 +8,22 @@ if [[ -f "$wrapsource" ]]; then
# directory name of the project. Virtual environment name can be overridden
# directory name of the project. Virtual environment name can be overridden
# 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
if
[
!
$WORKON_CWD
]
;
then
WORKON_CWD
=
1
# Check if this is a Git repo
PROJECT_ROOT
=
`
git rev-parse
--show-toplevel
2> /dev/null
`
PROJECT_ROOT
=
`
git rev-parse
--show-toplevel
2> /dev/null
`
if
((
$?
==
0
))
;
then
if
((
$?
!=
0
))
;
then
PROJECT_ROOT
=
"."
fi
# Check for virtualenv name override
# Check for virtualenv name override
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"
`
elif
[[
"
$PROJECT_ROOT
"
!=
"."
]]
;
then
ENV_NAME
=
`
basename
"
$PROJECT_ROOT
"
`
else
ENV_NAME
=
""
fi
fi
if
[[
"
$ENV_NAME
"
!=
""
]]
;
then
# Activate the environment only if it is not already active
# Activate the environment only if it is not already active
if
[[
"
$VIRTUAL_ENV
"
!=
"
$WORKON_HOME
/
$ENV_NAME
"
]]
;
then
if
[[
"
$VIRTUAL_ENV
"
!=
"
$WORKON_HOME
/
$ENV_NAME
"
]]
;
then
if
[[
-e
"
$WORKON_HOME
/
$ENV_NAME
/bin/activate"
]]
;
then
if
[[
-e
"
$WORKON_HOME
/
$ENV_NAME
/bin/activate"
]]
;
then
...
@@ -28,6 +36,8 @@ if [[ -f "$wrapsource" ]]; then
...
@@ -28,6 +36,8 @@ if [[ -f "$wrapsource" ]]; then
deactivate
&&
unset
CD_VIRTUAL_ENV
deactivate
&&
unset
CD_VIRTUAL_ENV
fi
fi
unset
PROJECT_ROOT
unset
PROJECT_ROOT
unset
WORKON_CWD
fi
}
}
# 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