From 56ff12d36bd2a03d00cb0bffa7d324415dce9ead Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 4 Sep 2015 17:15:30 +0900
Subject: [PATCH] Finalizing behavior for variants

---
 util.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/util.go b/util.go
index 6172cbd..58a4374 100644
--- a/util.go
+++ b/util.go
@@ -48,9 +48,14 @@ func makeAbsPath(path string) string {
 }
 
 func makeVariantNames(name, variant string) []string {
-	names := []string{name, strings.TrimSuffix(name, "__")}
+	if nameParts := strings.Split(name, "__"); len(nameParts) > 1 {
+		variant = nameParts[len(nameParts)-1]
+		name = strings.Join(nameParts[:len(nameParts)-1], "")
+	}
+
+	names := []string{name}
 	if len(variant) > 0 && !strings.HasSuffix(name, "__") {
-		names = []string{fmt.Sprint(name, "__", variant), name, strings.TrimSuffix(name, "__")}
+		names = []string{fmt.Sprint(name, "__", variant), name}
 	}
 
 	return names