File tree 5 files changed +14
-7
lines changed
5 files changed +14
-7
lines changed Original file line number Diff line number Diff line change @@ -39,11 +39,6 @@ linters-settings:
39
39
40
40
exhaustruct :
41
41
exclude :
42
- - " ^github.com/jclem/konk/konk.Command$"
43
- - " ^github.com/jclem/konk/konk.CommandConfig$"
44
- - " ^github.com/jclem/konk/konk.RunCommandConfig$"
45
- - " ^github.com/jclem/konk/konk.ShellCommandConfig$"
46
- - " ^github.com/jclem/konk/konk.RunConcurrentlyConfig$"
47
42
- " ^github.com/spf13/cobra.Command$"
48
43
49
44
funlen :
Original file line number Diff line number Diff line change @@ -40,6 +40,8 @@ var cCommand = cobra.Command{
40
40
commands , err := konk .RunConcurrently (cmd .Context (), konk.RunConcurrentlyConfig {
41
41
Commands : cmdParts ,
42
42
Labels : labels ,
43
+ Env : make ([]string , 0 ),
44
+ OmitEnv : false ,
43
45
AggregateOutput : aggregateOutput ,
44
46
ContinueOnError : continueOnError ,
45
47
NoColor : noColor ,
Original file line number Diff line number Diff line change @@ -88,9 +88,10 @@ var procCommand = cobra.Command{
88
88
commands , err := konk .RunConcurrently (cmd .Context (), konk.RunConcurrentlyConfig {
89
89
Commands : commandStrings ,
90
90
Labels : commandLabels ,
91
- ContinueOnError : continueOnError ,
92
91
Env : envLines ,
93
92
OmitEnv : omitEnv ,
93
+ AggregateOutput : false ,
94
+ ContinueOnError : continueOnError ,
94
95
NoColor : noColor ,
95
96
NoShell : noShell ,
96
97
})
Original file line number Diff line number Diff line change @@ -56,12 +56,16 @@ var sCommand = cobra.Command{
56
56
Args : parts [1 :],
57
57
Label : labels [i ],
58
58
NoColor : noColor ,
59
+ Env : make ([]string , 0 ),
60
+ OmitEnv : false ,
59
61
})
60
62
} else {
61
63
c = konk .NewShellCommand (konk.ShellCommandConfig {
62
64
Command : cmd ,
63
65
Label : labels [i ],
64
66
NoColor : noColor ,
67
+ Env : make ([]string , 0 ),
68
+ OmitEnv : false ,
65
69
})
66
70
}
67
71
@@ -74,7 +78,10 @@ var sCommand = cobra.Command{
74
78
ctx , cancel := context .WithCancel (context .Background ())
75
79
defer cancel ()
76
80
77
- if err := c .Run (ctx , cancel , konk.RunCommandConfig {}); err != nil && continueOnError {
81
+ if err := c .Run (ctx , cancel , konk.RunCommandConfig {
82
+ AggregateOutput : false ,
83
+ StopOnCancel : false ,
84
+ }); err != nil && continueOnError {
78
85
errCmd = err
79
86
} else if err != nil {
80
87
return fmt .Errorf ("running command: %w" , err )
Original file line number Diff line number Diff line change @@ -41,6 +41,7 @@ func NewShellCommand(conf ShellCommandConfig) *Command {
41
41
42
42
return & Command {
43
43
cmd : c ,
44
+ out : strings.Builder {},
44
45
prefix : prefix ,
45
46
}
46
47
}
@@ -69,6 +70,7 @@ func NewCommand(conf CommandConfig) *Command {
69
70
70
71
return & Command {
71
72
cmd : cmd ,
73
+ out : strings.Builder {},
72
74
prefix : prefix ,
73
75
}
74
76
}
You can’t perform that action at this time.
0 commit comments