Skip to content

Commit 232f9b2

Browse files
cmagliecmaglie
committed
Replaced 'executils' with go-paths library equivalent
1 parent 5935e45 commit 232f9b2

File tree

29 files changed

+34
-779
lines changed

29 files changed

+34
-779
lines changed

‎.licenses/go/github.com/arduino/go-paths-helper.dep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: github.com/arduino/go-paths-helper
3-
version: v1.9.2
3+
version: v1.10.0
44
type: go
55
summary:
66
homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper

‎arduino/builder/builder.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"github.com/arduino/arduino-cli/arduino/libraries"
3434
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
3535
"github.com/arduino/arduino-cli/arduino/sketch"
36-
"github.com/arduino/arduino-cli/executils"
3736
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3837
"github.com/arduino/go-paths-helper"
3938
"github.com/arduino/go-properties-orderedmap"
@@ -492,7 +491,7 @@ func (b *Builder) build() error {
492491
return nil
493492
}
494493

495-
func (b *Builder) prepareCommandForRecipe(buildProperties *properties.Map, recipe string, removeUnsetProperties bool) (*executils.Process, error) {
494+
func (b *Builder) prepareCommandForRecipe(buildProperties *properties.Map, recipe string, removeUnsetProperties bool) (*paths.Process, error) {
496495
pattern := buildProperties.Get(recipe)
497496
if pattern == "" {
498497
return nil, fmt.Errorf(tr("%[1]s pattern is missing"), recipe)
@@ -525,7 +524,7 @@ func (b *Builder) prepareCommandForRecipe(buildProperties *properties.Map, recip
525524
}
526525
}
527526

528-
command, err := executils.NewProcess(nil, parts...)
527+
command, err := paths.NewProcess(nil, parts...)
529528
if err != nil {
530529
return nil, err
531530
}
@@ -536,7 +535,7 @@ func (b *Builder) prepareCommandForRecipe(buildProperties *properties.Map, recip
536535
return command, nil
537536
}
538537

539-
func (b *Builder) execCommand(command *executils.Process) error {
538+
func (b *Builder) execCommand(command *paths.Process) error {
540539
if b.logger.Verbose() {
541540
b.logger.Info(utils.PrintableCommand(command.GetArgs()))
542541
command.RedirectStdoutTo(b.logger.Stdout())

‎arduino/builder/internal/compilation/database.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"fmt"
2121
"os"
2222

23-
"github.com/arduino/arduino-cli/executils"
2423
"github.com/arduino/arduino-cli/i18n"
2524
"github.com/arduino/go-paths-helper"
2625
)
@@ -71,7 +70,7 @@ func (db *Database) SaveToFile() {
7170
}
7271

7372
// Add adds a new CompilationDatabase entry
74-
func (db *Database) Add(target *paths.Path, command *executils.Process) {
73+
func (db *Database) Add(target *paths.Path, command *paths.Process) {
7574
commandDir := command.GetDir()
7675
if commandDir == "" {
7776
// This mimics what Cmd.Run also does: Use Dir if specified,

‎arduino/builder/internal/compilation/database_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package compilation
1818
import (
1919
"testing"
2020

21-
"github.com/arduino/arduino-cli/executils"
2221
"github.com/arduino/go-paths-helper"
2322
"github.com/stretchr/testify/require"
2423
)
@@ -28,7 +27,7 @@ func TestCompilationDatabase(t *testing.T) {
2827
require.NoError(t, err)
2928
defer tmpfile.Remove()
3029

31-
cmd, err := executils.NewProcess(nil, "gcc", "arg1", "arg2")
30+
cmd, err := paths.NewProcess(nil, "gcc", "arg1", "arg2")
3231
require.NoError(t, err)
3332
db := NewDatabase(tmpfile)
3433
db.Add(paths.New("test"), cmd)

‎arduino/builder/internal/diagnostics/compiler_detection.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"path/filepath"
2121
"strings"
2222

23-
"github.com/arduino/arduino-cli/executils"
23+
"github.com/arduino/go-paths-helper"
2424
semver "go.bug.st/relaxed-semver"
2525
)
2626

@@ -34,7 +34,7 @@ type DetectedCompiler struct {
3434

3535
// This function is overridden for mocking unit tests
3636
var runProcess = func(args ...string) []string {
37-
if cmd, err := executils.NewProcess(nil, args...); err == nil {
37+
if cmd, err := paths.NewProcess(nil, args...); err == nil {
3838
out := &bytes.Buffer{}
3939
cmd.RedirectStdoutTo(out)
4040
cmd.Run()

‎arduino/builder/internal/preprocessor/arduino_preprocessor.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323

2424
"github.com/arduino/arduino-cli/arduino/builder/internal/utils"
2525
"github.com/arduino/arduino-cli/arduino/sketch"
26-
"github.com/arduino/arduino-cli/executils"
2726
"github.com/arduino/go-paths-helper"
2827
"github.com/arduino/go-properties-orderedmap"
2928
"github.com/pkg/errors"
@@ -66,7 +65,7 @@ func PreprocessSketchWithArduinoPreprocessor(sk *sketch.Sketch, buildPath *paths
6665
return nil, nil, errors.WithStack(err)
6766
}
6867

69-
command, err := executils.NewProcess(nil, parts...)
68+
command, err := paths.NewProcess(nil, parts...)
7069
if err != nil {
7170
return nil, nil, err
7271
}

‎arduino/builder/internal/preprocessor/ctags.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"github.com/arduino/arduino-cli/arduino/builder/cpp"
2828
"github.com/arduino/arduino-cli/arduino/builder/internal/preprocessor/internal/ctags"
2929
"github.com/arduino/arduino-cli/arduino/sketch"
30-
"github.com/arduino/arduino-cli/executils"
3130
"github.com/arduino/arduino-cli/i18n"
3231
"github.com/arduino/go-paths-helper"
3332
"github.com/arduino/go-properties-orderedmap"
@@ -195,7 +194,7 @@ func RunCTags(sourceFile *paths.Path, buildProperties *properties.Map) ([]byte,
195194
if err != nil {
196195
return nil, nil, err
197196
}
198-
proc, err := executils.NewProcess(nil, parts...)
197+
proc, err := paths.NewProcess(nil, parts...)
199198
if err != nil {
200199
return nil, nil, err
201200
}

‎arduino/builder/internal/preprocessor/gcc.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"strings"
2222

2323
"github.com/arduino/arduino-cli/arduino/builder/cpp"
24-
"github.com/arduino/arduino-cli/executils"
2524
f "github.com/arduino/arduino-cli/internal/algorithms"
2625
"github.com/arduino/go-paths-helper"
2726
"github.com/arduino/go-properties-orderedmap"
@@ -69,7 +68,7 @@ func GCC(sourceFilePath *paths.Path, targetFilePath *paths.Path, includes paths.
6968
// to create a /dev/null.d dependency file, which won't work.
7069
args = f.Filter(args, f.NotEquals("-MMD"))
7170

72-
proc, err := executils.NewProcess(nil, args...)
71+
proc, err := paths.NewProcess(nil, args...)
7372
if err != nil {
7473
return nil, nil, err
7574
}

‎arduino/cores/packagemanager/install_uninstall.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/arduino/arduino-cli/arduino"
2525
"github.com/arduino/arduino-cli/arduino/cores"
2626
"github.com/arduino/arduino-cli/arduino/cores/packageindex"
27-
"github.com/arduino/arduino-cli/executils"
2827
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2928
"github.com/arduino/go-paths-helper"
3029
"github.com/pkg/errors"
@@ -239,7 +238,7 @@ func (pme *Explorer) RunPreOrPostScript(installDir *paths.Path, prefix string) (
239238
}
240239
script := installDir.Join(scriptFilename)
241240
if script.Exist() && script.IsNotDir() {
242-
cmd, err := executils.NewProcessFromPath(pme.GetEnvVarsForSpawnedProcess(), script)
241+
cmd, err := paths.NewProcessFromPath(pme.GetEnvVarsForSpawnedProcess(), script)
243242
if err != nil {
244243
return []byte{}, []byte{}, err
245244
}

‎arduino/discovery/discovery.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"sync"
2424
"time"
2525

26-
"github.com/arduino/arduino-cli/executils"
2726
"github.com/arduino/arduino-cli/i18n"
2827
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2928
"github.com/arduino/arduino-cli/version"
29+
"github.com/arduino/go-paths-helper"
3030
"github.com/arduino/go-properties-orderedmap"
3131
"github.com/pkg/errors"
3232
"github.com/sirupsen/logrus"
@@ -48,7 +48,7 @@ const (
4848
type PluggableDiscovery struct {
4949
id string
5050
processArgs []string
51-
process *executils.Process
51+
process *paths.Process
5252
outgoingCommandsPipe io.Writer
5353
incomingMessagesChan <-chan *discoveryMessage
5454

@@ -269,7 +269,7 @@ func (disc *PluggableDiscovery) sendCommand(command string) error {
269269

270270
func (disc *PluggableDiscovery) runProcess() error {
271271
logrus.Infof("starting discovery %s process", disc.id)
272-
proc, err := executils.NewProcess(nil, disc.processArgs...)
272+
proc, err := paths.NewProcess(nil, disc.processArgs...)
273273
if err != nil {
274274
return err
275275
}

0 commit comments

Comments
 (0)