Skip to content

Add complex commands #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add complex commands #217

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ab9142
use shell to run commands
nytoan Sep 29, 2025
52b860a
remove added carriage return
nytoan Sep 29, 2025
be79213
check for os
nytoan Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions helpers/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"errors"
"io"
"os"
"os/exec"
"strings"
"time"
Expand All @@ -18,11 +19,12 @@ import (
func RunCommand(ctx context.Context, command string, doneFn func(output string)) error {
var cmd *exec.Cmd

parts := strings.Fields(command)
if len(parts) == 1 {
cmd = exec.CommandContext(ctx, parts[0]) // #nosec G204
// Execute the command using a shell to handle pipes and other shell features.
// Use /bin/sh on Linux/macOS and cmd.exe on Windows.
if isWindows() {
cmd = exec.CommandContext(ctx, "cmd.exe", "/C", command) // #nosec G204
} else {
cmd = exec.CommandContext(ctx, parts[0], parts[1:]...) // #nosec G204
cmd = exec.CommandContext(ctx, "/bin/sh", "-c", command) // #nosec G204
}

// Create a pipe to read the output from.
Expand All @@ -49,7 +51,12 @@ func RunCommand(ctx context.Context, command string, doneFn func(output string))

_ = pw.Close()
<-finishedCh
doneFn(stdoutBytes.String())

// Trim the carriage return added by the use of a shell.
output := stdoutBytes.String()
output = strings.TrimRight(output, "\r\n")

doneFn(output)
}()

// Wait for the command to start
Expand Down Expand Up @@ -80,3 +87,8 @@ func logOutput(r io.Reader, startedCh, finishedCh chan struct{}) {
logger.Debug("Command output", map[string]any{"line": line})
}
}

// isWindows checks if the current OS is Windows.
func isWindows() bool {
return strings.HasPrefix(strings.ToLower(os.Getenv("OS")), "windows")
}