From d732e9e070ea6c035faa4e6ca0c790fc843c93c2 Mon Sep 17 00:00:00 2001
From: piotr <nwg.piotr@gmail.com>
Date: Sun, 15 Aug 2021 14:34:25 +0200
Subject: [PATCH] support env vars at the end of the command #11

---
 tools.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools.go b/tools.go
index c0d8083..10b7a12 100644
--- a/tools.go
+++ b/tools.go
@@ -583,17 +583,19 @@ func launch(command string, terminal bool) {
 	envVarsNum := strings.Count(command, "=")
 	var envVars []string
 
-	cmdIdx := 0
-	lastEnvVarIdx := 0
+	cmdIdx := -1
 
 	if envVarsNum > 0 {
 		for idx, item := range elements {
 			if strings.Contains(item, "=") {
-				lastEnvVarIdx = idx
 				envVars = append(envVars, item)
+			} else if !strings.HasPrefix(item, "-") && cmdIdx == -1 {
+				cmdIdx = idx
 			}
 		}
-		cmdIdx = lastEnvVarIdx + 1
+	}
+	if cmdIdx == -1 {
+		cmdIdx = 0
 	}
 
 	cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...)