Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Commit

Permalink
Minor clean up when running a command
Browse files Browse the repository at this point in the history
Signed-off-by: Chuck Ha <chuckh@vmware.com>
  • Loading branch information
chuckha committed Jan 14, 2020
1 parent 5081db4 commit c8e6941
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ bin
etcdadm
plantuml.jar
vendor
.idea
20 changes: 2 additions & 18 deletions binary/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,31 +80,15 @@ func get(url, archive string) error {
cmd := exec.Command("curl", strings.Fields(argStr)...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Start()
if err != nil {
return err
}
err = cmd.Wait()
if err != nil {
return err
}
return nil
return cmd.Run()
}

func extract(extractDir, archive string) error {
log.Printf("[install] extracting etcd archive %s to %s\n", archive, extractDir)
cmd := exec.Command("tar", "xzf", archive, "--strip-components=1", "-C", extractDir)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Start()
if err != nil {
return err
}
err = cmd.Wait()
if err != nil {
return err
}
return nil
return cmd.Run()
}

// Download downloads the etcd binaries in the directory specified by locationDir
Expand Down

0 comments on commit c8e6941

Please sign in to comment.