Merge pull request #389 from scop/feat/virtualenv-improvements

feat: virtualenv improvements

segment-virtualenv.go

@@ -3,21 +3,29 @@ package main
 import (
 	"os"
 	"path"
+	"strings"
 
 	"gopkg.in/ini.v1"
 
 	pwl "github.com/justjanne/powerline-go/powerline"
 )
 
 func segmentVirtualEnv(p *powerline) []pwl.Segment {
-	var env string
+	env := os.Getenv("VIRTUAL_ENV_PROMPT")
+	if strings.HasPrefix(env, "(") && strings.HasSuffix(env, ") ") {
+		env = strings.TrimPrefix(env, "(")
+		env = strings.TrimSuffix(env, ") ")
+	}
 	if env == "" {
-		env, _ = os.LookupEnv("VIRTUAL_ENV")
-		if env != "" {
-			cfg, err := ini.Load(path.Join(env, "pyvenv.cfg"))
+		venv, _ := os.LookupEnv("VIRTUAL_ENV")
+		if venv != "" {
+			cfg, err := ini.Load(path.Join(venv, "pyvenv.cfg"))
 			if err == nil {
 				env = cfg.Section("").Key("prompt").String()
 			}
+			if env == "" {
+				env = venv
+			}
 		}
 	}
 	if env == "" {