Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding venv check for VIRTUAL_ENV_PROMPT and assuring an empty 'prompt… #391

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion segment-virtualenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@ import (

func segmentVirtualEnv(p *powerline) []pwl.Segment {
var env string
if env == "" {
// honor the $VIRTUAL_ENV_PATH first
env, _ = os.LookupEnv("VIRTUAL_ENV_PATH")
}
if env == "" {
env, _ = os.LookupEnv("VIRTUAL_ENV")
if env != "" {
cfg, err := ini.Load(path.Join(env, "pyvenv.cfg"))
if err == nil {
// in the case of a "prompt" value not being set in cfg,
// Key() will create an empty value and return it. this
// obliterates the env derived from VIRTUAL_ENV
if err == nil && cfg.Section("").HasKey("prompt") {
env = cfg.Section("").Key("prompt").String()
}
}
Expand Down