Skip to content

Commit c7cda03

Browse files
Use default programmer if no other value is specified
1 parent c7c0367 commit c7cda03

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

commands/upload/upload.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ func Upload(ctx context.Context, req *rpc.UploadRequest, outStream io.Writer, er
150150
if programmer == "" && pme.GetProfile() != nil {
151151
programmer = pme.GetProfile().Programmer
152152
}
153+
if programmer == "" {
154+
programmer = sk.GetDefaultProgrammer()
155+
}
153156

154157
updatedPort, err := runProgramAction(
155158
pme,

internal/cli/compile/compile.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
272272
if prog == "" || programmer.GetProgrammer() != "" {
273273
prog = programmer.String(inst, fqbn)
274274
}
275+
if prog == "" {
276+
prog = sk.GetDefaultProgrammer()
277+
}
275278

276279
uploadRequest := &rpc.UploadRequest{
277280
Instance: inst,

internal/cli/debug/debug.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ func runDebugCommand(args []string, portArgs *arguments.Port, fqbnArg *arguments
108108
if prog == "" || programmer.GetProgrammer() != "" {
109109
prog = programmer.String(inst, fqbn)
110110
}
111+
if prog == "" {
112+
prog = sk.GetDefaultProgrammer()
113+
}
111114

112115
debugConfigRequested := &rpc.GetDebugConfigRequest{
113116
Instance: inst,

internal/cli/upload/upload.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) {
180180
if prog == "" || programmer.GetProgrammer() != "" {
181181
prog = programmer.String(inst, fqbn)
182182
}
183+
if prog == "" {
184+
prog = sketch.GetDefaultProgrammer()
185+
}
183186

184187
stdOut, stdErr, stdIOResult := feedback.OutputStreams()
185188
req := &rpc.UploadRequest{

0 commit comments

Comments
 (0)