status-im/mobile
2
0
Fork 0
mirror of synced 2025-02-24 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gomobile: say why a version is unknown

Browse Source 
Fixes golang/go#13238

Change-Id: Ib44f9833891d721843a0fa255d9a86f1c7d43902
Reviewed-on: https://go-review.googlesource.com/16929
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
David Crawshaw 2015-11-16 07:43:08 -05:00
parent 8835366576
commit a6a27b7fc9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/gomobile/version.go
View File

@ -27,25 +27,25 @@ func runVersion(cmd *command) (err error) {
// source code in GOPATH. If they don't match, currently there is no // source code in GOPATH. If they don't match, currently there is no
// way to reliably identify the revision number this binary was built // way to reliably identify the revision number this binary was built
// against. // against.
version := func() string { version, err := func() (string, error) {
bin, err := exec.LookPath(os.Args[0]) bin, err := exec.LookPath(os.Args[0])
if err != nil { if err != nil {
return "" return "", err
} }
bindir := filepath.Dir(bin) bindir := filepath.Dir(bin)
cmd := exec.Command("go", "install", "-x", "-n", "golang.org/x/mobile/cmd/gomobile") cmd := exec.Command("go", "install", "-x", "-n", "golang.org/x/mobile/cmd/gomobile")
cmd.Env = append(os.Environ(), "GOBIN="+bindir) cmd.Env = append(os.Environ(), "GOBIN="+bindir)
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil || len(out) != 0 { if err != nil {
return "" return "", fmt.Errorf("cannot test gomobile binary: %v, %s", err, out)
} }
if rev, err := mobileRepoRevision(); err == nil { if len(out) != 0 {
return rev return "", fmt.Errorf("binary is out of date, re-install it")
} }
return "" return mobileRepoRevision()
}() }()
if version == "" { if err != nil {
fmt.Println("gomobile version unknown") fmt.Printf("gomobile version unknown: %v\n", err)
return nil return nil
} }
@ -65,7 +65,7 @@ func runVersion(cmd *command) (err error) {
func mobileRepoRevision() (rev string, err error) { func mobileRepoRevision() (rev string, err error) {
b, err := exec.Command("go", "list", "-f", "{{.Dir}}", "golang.org/x/mobile/app").CombinedOutput() b, err := exec.Command("go", "list", "-f", "{{.Dir}}", "golang.org/x/mobile/app").CombinedOutput()
if err != nil { if err != nil {
return "", fmt.Errorf("mobile repo not found: %v", err) return "", fmt.Errorf("mobile repo not found: %v, %s", err, b)
} }
repo := filepath.Dir(string(b)) repo := filepath.Dir(string(b))
@ -74,7 +74,7 @@ func mobileRepoRevision() (rev string, err error) {
} }
revision, err := exec.Command("git", "log", "-n", "1", "--format=format: +%h %cd", "HEAD").CombinedOutput() revision, err := exec.Command("git", "log", "-n", "1", "--format=format: +%h %cd", "HEAD").CombinedOutput()
if err != nil { if err != nil {
return "", err return "", fmt.Errorf("mobile repo git log failed: %v, %s", err, revision)
} }
return string(bytes.Trim(revision, " \t\r\n")), nil return string(bytes.Trim(revision, " \t\r\n")), nil
} }