Prevent running command more than once

andreynering · andreynering · commit 53234b91e0e5 · 2017-03-08T20:13:52.000-03:00
diff --git a/variable_handling.go b/variable_handling.go
@@ -22,10 +22,15 @@ var (
 	ErrMultilineResultCmd = errors.New("Got multiline result from command")
 )
 
+var varCmds = make(map[string]string)
+
 func handleDynamicVariableContent(value string) (string, error) {
 	if value == "" || value[0] != '$' {
 		return value, nil
 	}
+	if result, ok := varCmds[value]; ok {
+		return result, nil
+	}
 	var cmd *exec.Cmd
 	if ShExists {
 		cmd = exec.Command(ShPath, "-c", value[1:])
@@ -44,7 +49,9 @@ func handleDynamicVariableContent(value string) (string, error) {
 	if bytes.ContainsRune(b, '\n') {
 		return "", ErrMultilineResultCmd
 	}
-	return strings.TrimSpace(string(b)), nil
+	result := strings.TrimSpace(string(b))
+	varCmds[value] = result
+	return result, nil
 }
 
 func (t *Task) handleVariables() (map[string]string, error) {

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,15 @@ var (`
`22`	`22`	`ErrMultilineResultCmd = errors.New("Got multiline result from command")`
`23`	`23`	`)`
`24`	`24`
	`25`	`+var varCmds = make(map[string]string)`
	`26`	`+`
`25`	`27`	`func handleDynamicVariableContent(value string) (string, error) {`
`26`	`28`	`if value == "" \|\| value[0] != '$' {`
`27`	`29`	`return value, nil`
`28`	`30`	`}`
	`31`	`+ if result, ok := varCmds[value]; ok {`
	`32`	`+ return result, nil`
	`33`	`+ }`
`29`	`34`	`var cmd *exec.Cmd`
`30`	`35`	`if ShExists {`
`31`	`36`	`cmd = exec.Command(ShPath, "-c", value[1:])`
`@@ -44,7 +49,9 @@ func handleDynamicVariableContent(value string) (string, error) {`
`44`	`49`	`if bytes.ContainsRune(b, '\n') {`
`45`	`50`	`return "", ErrMultilineResultCmd`
`46`	`51`	`}`
`47`		`- return strings.TrimSpace(string(b)), nil`
	`52`	`+ result := strings.TrimSpace(string(b))`
	`53`	`+ varCmds[value] = result`
	`54`	`+ return result, nil`
`48`	`55`	`}`
`49`	`56`
`50`	`57`	`func (t *Task) handleVariables() (map[string]string, error) {`