luzifer/streamdeck
1
0
Fork 0
mirror of https://github.com/Luzifer/streamdeck.git synced 2024-10-18 05:04:18 +00:00
Code Issues Releases Wiki Activity

Fix actin exec env support, add display exec env support

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2020-06-06 23:17:16 +02:00
parent 205d8110d0
commit 5282f7304e
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/streamdeck/action_exec.go
View file

@ -31,9 +31,18 @@ func (actionExec) Execute(attributes map[string]interface{}) error {
processEnv := env.ListToMap(os.Environ())
if e, ok := attributes["env"].(map[string]string); ok {
if e, ok := attributes["env"].(map[interface{}]interface{}); ok {
for k, v := range e {
processEnv[k] = v
key, ok := k.(string)
if !ok {
continue
}
value, ok := v.(string)
if !ok {
continue
}
processEnv[key] = value
}
}

20
cmd/streamdeck/display_exec.go
View file

@ -15,6 +15,7 @@ import (
"strings"
"time"
"github.com/Luzifer/go_helpers/v2/env"
"github.com/golang/freetype"
"github.com/golang/freetype/truetype"
"github.com/pkg/errors"
@ -58,8 +59,25 @@ func (d displayElementExec) Display(ctx context.Context, idx int, attributes map
// Execute command and parse it
var buf = new(bytes.Buffer)
processEnv := env.ListToMap(os.Environ())
if e, ok := attributes["env"].(map[interface{}]interface{}); ok {
for k, v := range e {
key, ok := k.(string)
if !ok {
continue
}
value, ok := v.(string)
if !ok {
continue
}
processEnv[key] = value
}
}
command := exec.Command(args[0], args[1:]...)
command.Env = os.Environ()
command.Env = env.MapToList(processEnv)
command.Stdout = buf
if err := command.Run(); err != nil {