wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

speculator: Nessle up some more if statements

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-11-11 15:13:34 +00:00
parent 740cc66a7c
commit 0f0359d9c1
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/speculator/main.go
View file

@ -74,8 +74,7 @@ func gitClone(url string, shared bool) (string, error) {
cmd.Args = append(cmd.Args, "--shared") cmd.Args = append(cmd.Args, "--shared")
} }
err := cmd.Run() if err := cmd.Run(); err != nil {
if err != nil {
return "", fmt.Errorf("error cloning repo: %v", err) return "", fmt.Errorf("error cloning repo: %v", err)
} }
return directory, nil return directory, nil
@ -92,8 +91,7 @@ func gitFetch(path string) error {
func runGitCommand(path string, args []string) error { func runGitCommand(path string, args []string) error {
cmd := exec.Command("git", args...) cmd := exec.Command("git", args...)
cmd.Dir = path cmd.Dir = path
err := cmd.Run() if err := cmd.Run(); err != nil {
if err != nil {
return fmt.Errorf("error running %q: %v", strings.Join(cmd.Args, " "), err) return fmt.Errorf("error running %q: %v", strings.Join(cmd.Args, " "), err)
} }
return nil return nil
@ -126,8 +124,7 @@ func generate(dir string) error {
cmd.Dir = path.Join(dir, "scripts") cmd.Dir = path.Join(dir, "scripts")
var b bytes.Buffer var b bytes.Buffer
cmd.Stderr = &b cmd.Stderr = &b
err := cmd.Run() if err := cmd.Run(); err != nil {
if err != nil {
return fmt.Errorf("error generating spec: %v\nOutput from gendoc:\n%v", err, b.String()) return fmt.Errorf("error generating spec: %v\nOutput from gendoc:\n%v", err, b.String())
} }
return nil return nil
@ -167,8 +164,7 @@ func (s *server) getSHAOf(ref string) (string, error) {
cmd.Dir = path.Join(s.matrixDocCloneURL) cmd.Dir = path.Join(s.matrixDocCloneURL)
var b bytes.Buffer var b bytes.Buffer
cmd.Stdout = &b cmd.Stdout = &b
err := cmd.Run() if err := cmd.Run(); err != nil {
if err != nil {
return "", fmt.Errorf("error generating spec: %v\nOutput from gendoc:\n%v", err, b.String()) return "", fmt.Errorf("error generating spec: %v\nOutput from gendoc:\n%v", err, b.String())
} }
return strings.TrimSpace(b.String()), nil return strings.TrimSpace(b.String()), nil