Refactor Shell.Run

simonwhitaker · Jul 21, 2024 · ef86b9a · ef86b9a
1 parent e4aa7a8
commit ef86b9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/runny/model.go b/runny/model.go
@@ -99,7 +99,7 @@ func (c *Config) Execute(name CommandName, args ...string) error {
 	// Check the If
 	cond := strings.TrimSpace(command.If)
 	if len(cond) > 0 {
-		err := shell.Run(cond, false, c.verbose)
+		err := shell.Run(cond, []string{}, false, c.verbose)
 		if err != nil {
 			// Run returns an error if the exit status is not zero. So in this case, this means the test failed.
 			if c.verbose {
@@ -112,7 +112,7 @@ func (c *Config) Execute(name CommandName, args ...string) error {
 	// Handle the Run
 	run := strings.TrimSpace(command.Run)
 	if len(run) > 0 {
-		err := shell.Run(run, true, c.verbose, args...)
+		err := shell.Run(run, args, true, c.verbose)
 		if err != nil {
 			fmt.Printf("%s %s\n", color.RedString(string(run)), secondaryColor.Sprint(err))
 			return err

diff --git a/runny/shell.go b/runny/shell.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Shell interface {
-	Run(string, bool, bool, ...string) error
+	Run(command string, extraArgs []string, echoStdout, verbose bool) error
 }
 
 type BashShell struct {
@@ -24,7 +24,7 @@ func NewShell(command string) (Shell, error) {
 	return nil, fmt.Errorf("unsupported shell: %s", command)
 }
 
-func (b BashShell) Run(command string, echoStdout bool, verbose bool, extraArgs ...string) error {
+func (b BashShell) Run(command string, extraArgs []string, echoStdout, verbose bool) error {
 	if len(extraArgs) > 0 {
 		command = command + " " + strings.Join(extraArgs, " ")
 	}