Skip to content

updater fixes #26

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

Merged
jdx merged 1 commit into from
May 8, 2015
Merged

updater fixes #26

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
36 changes: 12 additions & 24 deletions update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package main

import (
"compress/gzip"
"crypto/sha1"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"os/exec"
"path/filepath"
Expand All @@ -16,6 +13,7 @@ import (
"time"

"github.com/dickeyxxx/golock"
"github.com/franela/goreq"
)

var updateTopic = &Topic{
Expand Down Expand Up @@ -78,17 +76,15 @@ func updatePlugins() {
}

func updateCLI(channel string) {
Err("checking for CLI update... ")
manifest := getUpdateManifest(channel)
if manifest.Version == Version && manifest.Channel == Channel {
Errf("already on latest version %s\n", Version)
return
}
if !updatable() {
Errf("Out of date: You are running %s but %s is out\n", Version, manifest.Version)
return
}
Errf("updating from %s to %s (%s)... ", Version, manifest.Version, manifest.Channel)
Errf("updating v4 CLI to %s (%s)... ", manifest.Version, manifest.Channel)
build := manifest.Builds[runtime.GOOS][runtime.GOARCH]
// on windows we can't remove an existing file or remove the running binary
// so we download the file to binName.new
Expand All @@ -101,9 +97,7 @@ func updateCLI(channel string) {
panic("SHA mismatch")
}
os.Remove(binPath + ".old")
if err := os.Rename(binPath, binPath+".old"); err != nil {
panic(err)
}
os.Rename(binPath, binPath+".old")
if err := os.Rename(binPath+".new", binPath); err != nil {
panic(err)
}
Expand Down Expand Up @@ -140,12 +134,14 @@ type manifest struct {
}

func getUpdateManifest(channel string) manifest {
res, err := http.Get("https://d1gvo455cekpjp.cloudfront.net/" + channel + "/manifest.json")
res, err := goreq.Request{
Uri: "https://d1gvo455cekpjp.cloudfront.net/" + channel + "/manifest.json",
}.Do()
if err != nil {
panic(err)
}
var m manifest
json.NewDecoder(res.Body).Decode(&m)
res.Body.FromJsonTo(&m)
return m
}

Expand All @@ -162,22 +158,14 @@ func downloadBin(path, url string) error {
if err != nil {
return err
}
client := &http.Client{}
req, err := http.NewRequest("GET", url+".gz", nil)
if err != nil {
return err
}
req.Header.Add("Accept-Encoding", "gzip")
resp, err := client.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
uncompressed, err := gzip.NewReader(resp.Body)
res, err := goreq.Request{
Uri: url + ".gz",
}.Do()
if err != nil {
return err
}
_, err = io.Copy(out, uncompressed)
defer res.Body.Close()
_, err = io.Copy(out, res.Body)
if err != nil {
return err
}
Expand Down