mirror of
https://github.com/go-task/task.git
synced 2025-06-04 23:38:05 +02:00
Fix "=" not being reconized in variables/environment variables
Fixes #19
This commit is contained in:
parent
c2773a7287
commit
0db3e9a05d
@ -57,6 +57,7 @@ func TestVars(t *testing.T) {
|
|||||||
{"bar.txt", "bar"},
|
{"bar.txt", "bar"},
|
||||||
{"foo2.txt", "foo2"},
|
{"foo2.txt", "foo2"},
|
||||||
{"bar2.txt", "bar2"},
|
{"bar2.txt", "bar2"},
|
||||||
|
{"equal.txt", "foo=bar"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, f := range files {
|
for _, f := range files {
|
||||||
|
7
testdata/vars/Taskfile.yml
vendored
7
testdata/vars/Taskfile.yml
vendored
@ -2,11 +2,18 @@ default:
|
|||||||
deps: [hello]
|
deps: [hello]
|
||||||
|
|
||||||
hello:
|
hello:
|
||||||
|
deps: [set-equal]
|
||||||
cmds:
|
cmds:
|
||||||
- echo {{.FOO}} > foo.txt
|
- echo {{.FOO}} > foo.txt
|
||||||
- echo {{.BAR}} > bar.txt
|
- echo {{.BAR}} > bar.txt
|
||||||
- echo {{.FOO2}} > foo2.txt
|
- echo {{.FOO2}} > foo2.txt
|
||||||
- echo {{.BAR2}} > bar2.txt
|
- echo {{.BAR2}} > bar2.txt
|
||||||
|
- echo {{.EQUAL}} > equal.txt
|
||||||
vars:
|
vars:
|
||||||
FOO: foo
|
FOO: foo
|
||||||
BAR: $echo bar
|
BAR: $echo bar
|
||||||
|
|
||||||
|
set-equal:
|
||||||
|
set: EQUAL
|
||||||
|
cmds:
|
||||||
|
- echo foo=bar
|
||||||
|
@ -97,21 +97,17 @@ func ReplaceVariables(initial string, vars map[string]string) (string, error) {
|
|||||||
|
|
||||||
// GetEnvironmentVariables returns environment variables as map
|
// GetEnvironmentVariables returns environment variables as map
|
||||||
func getEnvironmentVariables() map[string]string {
|
func getEnvironmentVariables() map[string]string {
|
||||||
type getKeyValFunc func(item string) (key, val string)
|
var (
|
||||||
getEnvironment := func(data []string, getKeyVal getKeyValFunc) map[string]string {
|
env = os.Environ()
|
||||||
items := make(map[string]string)
|
m = make(map[string]string, len(env))
|
||||||
for _, item := range data {
|
)
|
||||||
key, val := getKeyVal(item)
|
|
||||||
items[key] = val
|
for _, e := range env {
|
||||||
|
keyVal := strings.SplitN(e, "=", 2)
|
||||||
|
key, val := keyVal[0], keyVal[1]
|
||||||
|
m[key] = val
|
||||||
}
|
}
|
||||||
return items
|
return m
|
||||||
}
|
|
||||||
return getEnvironment(os.Environ(), func(item string) (key, val string) {
|
|
||||||
splits := strings.Split(item, "=")
|
|
||||||
key = splits[0]
|
|
||||||
val = splits[1]
|
|
||||||
return
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func readTaskvarsFile() (map[string]string, error) {
|
func readTaskvarsFile() (map[string]string, error) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user