Skip to content
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

print command execution output to stderr #256

Merged
merged 1 commit into from
Jan 1, 2020
+8 −18
Merged

print command execution output to stderr #256

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
14 changes: 2 additions & 12 deletions cmdutil/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
// Run the command
func Run(command string, args ...string) error {
cmd := exec.Command(command, args...)
cmd.Stdout = os.Stdout
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr

return RunCommand(cmd, false)
Expand All @@ -31,7 +31,7 @@ func RunSilently(command string, args ...string) error {
// RunInDir runs the command in the specified directory
func RunInDir(dir, command string, args ...string) error {
cmd := exec.Command(command, args...)
cmd.Stdout = os.Stdout
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
cmd.Dir = dir

Expand All @@ -48,16 +48,6 @@ func RunInDirSilently(dir, command string, args ...string) error {
return RunCommand(cmd, true)
}

// RunInDirStderr run the command in the specified directory and prevent stdout output
func RunInDirStderr(dir, command string, args ...string) error {
cmd := exec.Command(command, args...)
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
cmd.Dir = dir

return RunCommand(cmd, true)
}

// RunFunc for the type command execution
type RunFunc func(*exec.Cmd) error

Expand Down
12 changes: 6 additions & 6 deletions vcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ var GitBackend = &VCSBackend{
return nil
},
Init: func(dir string) error {
return cmdutil.RunInDirStderr(dir, "git", "init")
return cmdutil.RunInDir(dir, "git", "init")
},
Contents: []string{".git"},
}
Expand Down Expand Up @@ -251,7 +251,7 @@ var MercurialBackend = &VCSBackend{
return runInDir(vg.silent)(vg.dir, "hg", "pull", "--update")
},
Init: func(dir string) error {
return cmdutil.RunInDirStderr(dir, "hg", "init")
return cmdutil.RunInDir(dir, "hg", "init")
},
Contents: []string{".hg"},
}
Expand Down Expand Up @@ -281,7 +281,7 @@ var DarcsBackend = &VCSBackend{
return runInDir(vg.silent)(vg.dir, "darcs", "pull")
},
Init: func(dir string) error {
return cmdutil.RunInDirStderr(dir, "darcs", "init")
return cmdutil.RunInDir(dir, "darcs", "init")
},
Contents: []string{"_darcs"},
}
Expand Down Expand Up @@ -317,10 +317,10 @@ var FossilBackend = &VCSBackend{
return runInDir(vg.silent)(vg.dir, "fossil", "update")
},
Init: func(dir string) error {
if err := cmdutil.RunInDirStderr(dir, "fossil", "init", fossilRepoName); err != nil {
if err := cmdutil.RunInDir(dir, "fossil", "init", fossilRepoName); err != nil {
return err
}
return cmdutil.RunInDirStderr(dir, "fossil", "open", fossilRepoName)
return cmdutil.RunInDir(dir, "fossil", "open", fossilRepoName)
},
Contents: []string{".fslckout", "_FOSSIL_"},
}
Expand All @@ -344,7 +344,7 @@ var BazaarBackend = &VCSBackend{
return runInDir(vg.silent)(vg.dir, "bzr", "pull", "--overwrite")
},
Init: func(dir string) error {
return cmdutil.RunInDirStderr(dir, "bzr", "init")
return cmdutil.RunInDir(dir, "bzr", "init")
},
Contents: []string{".bzr"},
}
Expand Down