taigrr/go-selfupdate
1
0
Fork 0
mirror of https://github.com/taigrr/go-selfupdate synced 2025-01-18 04:33:12 -08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6 from jchenry/cleanup

Browse Source 
removed some unnecessary fmt.Printlns and added some error passing
This commit is contained in:
Mark 2015-03-30 08:52:51 -07:00
commit 7761197a67
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
selfupdate/selfupdate.go
View File

@ -90,17 +90,16 @@ type Updater struct {
func (u *Updater) getExecRelativeDir(dir string) string { func (u *Updater) getExecRelativeDir(dir string) string {
filename, _ := osext.Executable() filename, _ := osext.Executable()
path := filepath.Join(filepath.Dir(filename), dir) path := filepath.Join(filepath.Dir(filename), dir)
fmt.Println(path)
return path return path
} }
// BackgroundRun starts the update check and apply cycle. // BackgroundRun starts the update check and apply cycle.
func (u *Updater) BackgroundRun() { func (u *Updater) BackgroundRun() error {
os.MkdirAll(u.getExecRelativeDir(u.Dir), 0777) os.MkdirAll(u.getExecRelativeDir(u.Dir), 0777)
if u.wantUpdate() { if u.wantUpdate() {
if err := up.CanUpdate(); err != nil { if err := up.CanUpdate(); err != nil {
// fail // fail
return return err
} }
//self, err := osext.Executable() //self, err := osext.Executable()
//if err != nil { //if err != nil {
@ -109,9 +108,10 @@ func (u *Updater) BackgroundRun() {
//} //}
// TODO(bgentry): logger isn't on Windows. Replace w/ proper error reports. // TODO(bgentry): logger isn't on Windows. Replace w/ proper error reports.
if err := u.update(); err != nil { if err := u.update(); err != nil {
log.Println(err) return err
} }
} }
return nil
} }
func (u *Updater) wantUpdate() bool { func (u *Updater) wantUpdate() bool {
@ -146,8 +146,11 @@ func (u *Updater) update() error {
if err == ErrHashMismatch { if err == ErrHashMismatch {
log.Println("update: hash mismatch from patched binary") log.Println("update: hash mismatch from patched binary")
} else { } else {
log.Println("update: patching binary,", err) if u.DiffURL != "" {
log.Println("update: patching binary,", err)
}
} }
bin, err = u.fetchAndVerifyFullBin() bin, err = u.fetchAndVerifyFullBin()
if err != nil { if err != nil {
if err == ErrHashMismatch { if err == ErrHashMismatch {
@ -174,8 +177,6 @@ func (u *Updater) update() error {
} }
func (u *Updater) fetchInfo() error { func (u *Updater) fetchInfo() error {
fmt.Println(u.ApiURL)
fmt.Println(plat)
r, err := fetch(u.ApiURL + u.CmdName + "/" + plat + ".json") r, err := fetch(u.ApiURL + u.CmdName + "/" + plat + ".json")
if err != nil { if err != nil {
return err return err