env:fix incorrect extra line breaks & subcmd match

xtool/env/env.go

@@ -35,7 +35,7 @@ func ExpandEnv(s string) string {
 
 func expandEnvWithCmd(s string) string {
 	expanded := reSubcmd.ReplaceAllStringFunc(s, func(m string) string {
-		subcmd := strings.TrimSpace(s[2 : len(s)-1])
+		subcmd := strings.TrimSpace(m[2 : len(m)-1])
 
 		args := parseSubcmd(subcmd)
 
@@ -55,9 +55,9 @@ func expandEnvWithCmd(s string) string {
 			return ""
 		}
 
-		return string(out)
+		return strings.Replace(strings.TrimSpace(string(out)), "\n", " ", -1)
 	})
-	return os.Expand(expanded, os.Getenv)
+	return strings.TrimSpace(os.Expand(expanded, os.Getenv))
 }
 
 func parseSubcmd(s string) []string {