Skip to content

perf(windows): fold shell option once #2605

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
CatsDeservePets wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf(windows): fold shell option once #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,12 @@ func (e *setExpr) eval(app *app, _ []string) {
return
}
case "shell":
gOpts.shell = e.val
if strings.EqualFold(e.val, "cmd") {
// Enforce lowercase spelling to simplify special handling later.
gOpts.shell = "cmd"
} else {
gOpts.shell = e.val
}
case "shellflag":
gOpts.shellflag = e.val
case "shellopts":
Expand Down
8 changes: 4 additions & 4 deletions os_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ func detachedCommand(name string, arg ...string) *exec.Cmd {
}

func shellCommand(s string, args []string) *exec.Cmd {
// Windows CMD requires special handling to deal with quoted arguments
if strings.ToLower(gOpts.shell) == "cmd" {
// Windows cmd requires special handling to deal with quoted arguments.
if gOpts.shell == "cmd" {
var builder strings.Builder
builder.WriteString(s)
for _, arg := range args {
Expand Down Expand Up @@ -221,8 +221,8 @@ func errCrossDevice(err error) bool {
}

func quoteString(s string) string {
// Windows CMD requires special handling to deal with quoted arguments
if strings.ToLower(gOpts.shell) == "cmd" {
// Windows cmd requires special handling to deal with quoted arguments.
if gOpts.shell == "cmd" {
return fmt.Sprintf(`"%s"`, s)
}
return s
Expand Down
Loading